Checking for $EDITOR at keyringer_set_env

diff --git a/lib/keyringer/functions b/lib/keyringer/functions
index 24df5afa6340d0be0e0f67c142fe4c8ea013d974..d474666f9d1f8cab15cd1d2fe18c20f961e7aff0 100644 (file)
--- a/lib/keyringer/functions
+++ b/lib/keyringer/functions
@@ -175,6 +175,11 @@ function keyringer_set_env {
     echo "No recipient config was found"
     exit 1
   fi
+
+  if [ -z "$EDITOR" ]; then
+    echo "You have to set EDITOR env variable"
+    exit 1
+  fi
 }
 
 # Get a single argument

diff --git a/share/keyringer/edit b/share/keyringer/edit
index 8584c32892361093a4d77398b3b84f13bbe718fa..bee1d7bcca4cbbadb48b952f4ef8b5d9f1c81cfe 100755 (executable)
--- a/share/keyringer/edit
+++ b/share/keyringer/edit
@@ -11,11 +11,6 @@ keyringer_set_env $*
 # Get file
 keyringer_get_file $2
 
-if [ -z "$EDITOR" ]; then
-  echo "You have to set EDITOR env variable"
-  exit 1
-fi
-
 echo "Make sure that $BASEDIR is atop of an encrypted volume."
 
 # Set a tmp file