Running keyringer_set_env when sourcing $LIB

13 files changed, 3 insertions, 12 deletions

diff --git a/lib/keyringer/functions b/lib/keyringer/functions
index 13502f7..9c37291 100644
--- 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 18e8232..436b1ca 100755
--- 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 003dfd1..a3adca7 100755
--- 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 254acb0..befc014 100755
--- 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 6b201a9..b4e13a0 100755
--- 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 d0c0a32..26b2710 100755
--- 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 77b9388..89ee828 100755
--- 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 d9a9f82..439198a 100755
--- 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 9d987de..e28637b 100755
--- 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 fc404bb..84d1c27 100755
--- 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 626969f..9eb2a1f 100755
--- 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 df707c5..593a994 100755
--- 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 bc1147c..48a5f87 100755
--- 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