Making code that checks for file argument as a common function

diff --git a/lib/keyringer/functions b/lib/keyringer/functions
index adaf576dd3814f0ecba3cfcb559c32109d5918cf..24df5afa6340d0be0e0f67c142fe4c8ea013d974 100644 (file)
--- a/lib/keyringer/functions
+++ b/lib/keyringer/functions
@@ -176,3 +176,37 @@ function keyringer_set_env {
     exit 1
   fi
 }
+
+# Get a single argument
+function keyringer_get_arg {
+  if [ -z "$1" ]; then
+    keyringer_action_usage
+    exit 1
+  fi
+
+  echo $1
+}
+
+# Get a file argument
+function keyringer_get_file {
+  FILE="`keyringer_filename $1`"
+  
+  if [ -z "$FILE" ]; then
+    keyringer_action_usage
+    exit 1
+  elif [ ! -f "$KEYDIR/$FILE" ]; then
+    echo "File not found: $KEYDIR/$FILE"
+    exit 1
+  fi
+}
+
+# Run the action usage
+function keyringer_action_usage {
+  if [ "`type -t "keyringer_usage_$BASENAME"`" == "function" ]; then
+    # Use custom action usage
+    keyringer_usage_$BASENAME
+  else
+    # Default usage
+    echo "Usage: keyringer <keyring> $BASENAME <file>"
+  fi
+}

diff --git a/share/keyringer/append b/share/keyringer/append
index fbfe49f8846503724b86a62c5a62e607922fdf60..309f88c0192dcb086139ef467066380c547b7618 100755 (executable)
--- a/share/keyringer/append
+++ b/share/keyringer/append
@@ -8,16 +8,8 @@ LIB="`dirname $0`/../../lib/keyringer/functions"
 source $LIB
 keyringer_set_env $*
 
-# Aditional parameters
-FILE="`keyringer_filename $2`"
-
-if [ -z "$FILE" ]; then
-  echo "Usage: keyringer <keyring> `basename $0` <file>"
-  exit 1
-elif [ ! -f "$KEYDIR/$FILE" ]; then
-  echo "File not found: $KEYDIR/$FILE"
-  exit 1
-fi
+# Get file
+keyringer_get_file $2
 
 OLDIFS=$IFS
 IFS=$'\n'

diff --git a/share/keyringer/decrypt b/share/keyringer/decrypt
index cb1d35b7bc563437f7d29d3c5c3bc43dca05334b..71367f54acc15f8404940557be2ea1fff9cbbc0d 100755 (executable)
--- a/share/keyringer/decrypt
+++ b/share/keyringer/decrypt
@@ -8,15 +8,7 @@ LIB="`dirname $0`/../../lib/keyringer/functions"
 source $LIB
 keyringer_set_env $*
 
-# Aditional parameters
-FILE="`keyringer_filename $2`"
-
-if [ -z "$FILE" ]; then
-  echo "Usage: keyringer <keyring> `basename $0` <file>"
-  exit 1
-elif [ ! -f "$KEYDIR/$FILE" ]; then
-  echo "File not found: $KEYDIR/$FILE"
-  exit 1
-fi
+# Get file
+keyringer_get_file $2
 
 gpg --quiet --use-agent -d $KEYDIR/$FILE

diff --git a/share/keyringer/del b/share/keyringer/del
index c6993949cb0a68c88d1f139a4f257cc047e4b3c0..d8ed68f169c261d4e3fce4b0b18f98add4bb0c4a 100755 (executable)
--- a/share/keyringer/del
+++ b/share/keyringer/del
@@ -8,17 +8,8 @@ LIB="`dirname $0`/../../lib/keyringer/functions"
 source $LIB
 keyringer_set_env $*
 
-# Aditional parameters
-FILE="`keyringer_filename $2`"
-
-# Setup
-if [ -z "$FILE" ]; then
-  echo "Usage: keyringer <keyring> `basename $0` <file>"
-  exit 1
-elif [ ! -f "$KEYDIR/$FILE" ]; then
-  echo "File not found: $KEYDIR/$FILE"
-  exit 1
-fi
+# Get file
+keyringer_get_file $2
 
 # Remove
 if [ -d "$KEYDIR/.git" ]; then

diff --git a/share/keyringer/edit b/share/keyringer/edit
index dff42e605882d1b0898ea7af1ed5c7fe7bd1132b..8584c32892361093a4d77398b3b84f13bbe718fa 100755 (executable)
--- a/share/keyringer/edit
+++ b/share/keyringer/edit
@@ -8,16 +8,10 @@ LIB="`dirname $0`/../../lib/keyringer/functions"
 source $LIB
 keyringer_set_env $*
 
-# Aditional parameters
-FILE="`keyringer_filename $2`"
+# Get file
+keyringer_get_file $2
 
-if [ -z "$FILE" ]; then
-  echo "Usage: keyringer <keyring> `basename $0` <file>"
-  exit 1
-elif [ ! -f "$KEYDIR/$FILE" ]; then
-  echo "File not found: $KEYDIR/$FILE"
-  exit 1
-elif [ -z "$EDITOR" ]; then
+if [ -z "$EDITOR" ]; then
   echo "You have to set EDITOR env variable"
   exit 1
 fi

diff --git a/share/keyringer/recrypt b/share/keyringer/recrypt
index 32a8a39a3c70e8485b343d852b6dcb95a9b40482..92afa99274fa2a9a0c523c0a47c9a0769c8b935e 100755 (executable)
--- a/share/keyringer/recrypt
+++ b/share/keyringer/recrypt
@@ -8,15 +8,7 @@ LIB="`dirname $0`/../../lib/keyringer/functions"
 source $LIB
 keyringer_set_env $*
 
-# Aditional parameters
-FILE="`keyringer_filename $2`"
-
-if [ -z "$FILE" ]; then
-  echo "Usage: keyringer <keyring> `basename $0` <file>"
-  exit 1
-if [ ! -f "$KEYDIR/$FILE" ]; then
-  echo "File not found: $KEYDIR/$FILE"
-  exit 1
-fi
+# Get file
+keyringer_get_file $2
 
 gpg --use-agent -d $KEYDIR/$FILE | gpg --use-agent --armor -e -s $(keyringer_recipients $RECIPIENTS) > $KEYDIR/$FILE