Running keyringer_set_env when sourcing $LIB

diff --git a/lib/keyringer/functions b/lib/keyringer/functions
index 13502f795d6790f111fe607e222b6321bfe2a995..9c37291485befcda2fc5daae290eaa7ec4051481 100644 (file)
--- a/lib/keyringer/functions
+++ b/lib/keyringer/functions
@@ -238,3 +238,6 @@ function keyringer_get_command {
     exit 1
   fi
 }
+
+# Setup environment
+keyringer_set_env $*

diff --git a/share/keyringer/append b/share/keyringer/append
index 18e823236351477e89f96d6e3f0bd650490f70a0..436b1ca38a4e24c5e1bd2f491f6cd1cb3a915bfe 100755 (executable)
--- a/share/keyringer/append
+++ b/share/keyringer/append
@@ -6,7 +6,6 @@
 # Load functions
 LIB="`dirname $0`/../../lib/keyringer/functions"
 source $LIB || exit 1
-keyringer_set_env $*
 
 # Get file
 keyringer_get_file $2

diff --git a/share/keyringer/decrypt b/share/keyringer/decrypt
index 003dfd168b4d51314f2f787af5ac82c89f4ec6a9..a3adca7d4d59a7172f5133840fd8ee12947b8c01 100755 (executable)
--- a/share/keyringer/decrypt
+++ b/share/keyringer/decrypt
@@ -6,7 +6,6 @@
 # Load functions
 LIB="`dirname $0`/../../lib/keyringer/functions"
 source $LIB || exit 1
-keyringer_set_env $*
 
 # Get file
 keyringer_get_file $2

diff --git a/share/keyringer/del b/share/keyringer/del
index 254acb096dac9774b971f133ed989a1c71bcbdde..befc0148bb312d41e10a2755badfd66625af5206 100755 (executable)
--- a/share/keyringer/del
+++ b/share/keyringer/del
@@ -6,7 +6,6 @@
 # Load functions
 LIB="`dirname $0`/../../lib/keyringer/functions"
 source $LIB || exit 1
-keyringer_set_env $*
 
 # Get file
 keyringer_get_file $2

diff --git a/share/keyringer/edit b/share/keyringer/edit
index 6b201a9bea464c0006d3e736510a4f49c7479861..b4e13a0dc04738e74a87618ae469f32aa9d3df9b 100755 (executable)
--- a/share/keyringer/edit
+++ b/share/keyringer/edit
@@ -6,7 +6,6 @@
 # Load functions
 LIB="`dirname $0`/../../lib/keyringer/functions"
 source $LIB || exit 1
-keyringer_set_env $*
 
 # Get file
 keyringer_get_file $2

diff --git a/share/keyringer/encrypt b/share/keyringer/encrypt
index d0c0a325dcb657c8014638872a61262a2bc40d44..26b27105687385d8419eab9ce84c9b56443f2c83 100755 (executable)
--- a/share/keyringer/encrypt
+++ b/share/keyringer/encrypt
@@ -6,7 +6,6 @@
 # Load functions
 LIB="`dirname $0`/../../lib/keyringer/functions"
 source $LIB || exit 1
-keyringer_set_env $*
 
 # Aditional parameters
 FILE="`keyringer_filename $2`"

diff --git a/share/keyringer/genpair b/share/keyringer/genpair
index 77b9388e618306cfe2d6b11d51efdcc9cfc6ab38..89ee82819e8790e2fc2a32df88f8637f3a83aceb 100755 (executable)
--- a/share/keyringer/genpair
+++ b/share/keyringer/genpair
@@ -113,7 +113,6 @@ function genpair_ssl {
 # Load functions
 LIB="`dirname $0`/../../lib/keyringer"
 source $LIB/functions || exit 1
-keyringer_set_env $*
 
 # Aditional parameters
 KEYTYPE="$2"

diff --git a/share/keyringer/git b/share/keyringer/git
index d9a9f82663fa68b1d7ae81731699643ec815c078..439198aa7a08191ba910da3bfb4d8bdb6af3879a 100755 (executable)
--- a/share/keyringer/git
+++ b/share/keyringer/git
@@ -6,7 +6,6 @@
 # Load functions
 LIB="`dirname $0`/../../lib/keyringer/functions"
 source $LIB || exit 1
-keyringer_set_env $*
 
 # Aditional parameters
 CWD="`pwd`"

diff --git a/share/keyringer/ls b/share/keyringer/ls
index 9d987de45e0b79a71efe2a39b6c96351fa2a17ea..e28637b9c53cb7e8efef55d4745c76f8240ced8d 100755 (executable)
--- a/share/keyringer/ls
+++ b/share/keyringer/ls
@@ -6,7 +6,6 @@
 # Load functions
 LIB="`dirname $0`/../../lib/keyringer/functions"
 source $LIB || exit 1
-keyringer_set_env $*
 
 # Aditional parameters
 CWD="`pwd`"

diff --git a/share/keyringer/newkeys b/share/keyringer/newkeys
index fc404bbb7ab12fc892ba8ca91b372388a046ec5c..84d1c275027b736252a5234a4e40db4a3891dcdd 100755 (executable)
--- a/share/keyringer/newkeys
+++ b/share/keyringer/newkeys
@@ -37,7 +37,6 @@ function newkeys_puppet {
 # Load functions
 LIB="`dirname $0`/../../lib/keyringer"
 source $LIB/functions || exit 1
-keyringer_set_env $*
 
 # Command parser
 keyringer_get_command $2

diff --git a/share/keyringer/options b/share/keyringer/options
index 626969f579e3bb50e7d756e78b4c4992feaff195..9eb2a1f3ca9cf526981a1c1b05e644f4f288e583 100755 (executable)
--- a/share/keyringer/options
+++ b/share/keyringer/options
@@ -6,7 +6,6 @@
 # Load functions
 LIB="`dirname $0`/../../lib/keyringer"
 source $LIB/functions || exit 1
-keyringer_set_env $*
 
 # Command parser
 keyringer_get_command $2

diff --git a/share/keyringer/recipients b/share/keyringer/recipients
index df707c5e623fff48812519a2ec434b9fdba83d6f..593a9946fafa605de4e77ee6cba5abb466c476c2 100755 (executable)
--- a/share/keyringer/recipients
+++ b/share/keyringer/recipients
@@ -6,7 +6,6 @@
 # Load functions
 LIB="`dirname $0`/../../lib/keyringer"
 source $LIB/functions || exit 1
-keyringer_set_env $*
 
 # Command parser
 keyringer_get_command $2

diff --git a/share/keyringer/recrypt b/share/keyringer/recrypt
index bc1147cc6bc23963acccc493d9e6a739a06bee31..48a5f87252b6483bde9f763cd9cb1a09199ad8a7 100755 (executable)
--- a/share/keyringer/recrypt
+++ b/share/keyringer/recrypt
@@ -6,7 +6,6 @@
 # Load functions
 LIB="`dirname $0`/../../lib/keyringer/functions"
 source $LIB || exit 1
-keyringer_set_env $*
 
 # Get file
 keyringer_get_file $2