From 2aa6f0127bad78d4dc3279f104c4660ee47855a5 Mon Sep 17 00:00:00 2001
From: Silvio Rhatto <rhatto@riseup.net>
Date: Sat, 18 Sep 2010 12:43:29 -0300
Subject: Checking for $EDITOR at keyringer_set_env

---
 lib/keyringer/functions | 5 +++++
 share/keyringer/edit    | 5 -----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/lib/keyringer/functions b/lib/keyringer/functions
index 24df5af..d474666 100644
--- 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 8584c32..bee1d7b 100755
--- 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
-- 
cgit v1.2.3