Using RELATIVE_PATH directly at keyringer_get_file and keyringer_get_new_file

diff --git a/lib/keyringer/actions/append b/lib/keyringer/actions/append
index 818a7ac5665bee3e757436e12cd7accb63309910..fbb6c1c57c3367435a76c7849d3428f9316a5b39 100755 (executable)
--- a/lib/keyringer/actions/append
+++ b/lib/keyringer/actions/append
@@ -8,7 +8,7 @@ LIB="`dirname $0`/../functions"
 source "$LIB" || exit 1
 
 # Get file
-keyringer_get_file "$RELATIVE_PATH/$2"
+keyringer_get_file "$2"
 
 # Only display directions if we're running append, not append-batch
 if [ "$BASENAME" == "append" ]; then

diff --git a/lib/keyringer/actions/decrypt b/lib/keyringer/actions/decrypt
index aab7881134ffb69496a061c98b37b0690ed87080..2b1401c70f32367215a0ac0d775ee14b2c47be65 100755 (executable)
--- a/lib/keyringer/actions/decrypt
+++ b/lib/keyringer/actions/decrypt
@@ -8,7 +8,7 @@ LIB="`dirname $0`/../functions"
 source "$LIB" || exit 1
 
 # Get file
-keyringer_get_file "$RELATIVE_PATH/$2"
+keyringer_get_file "$2"
 
 # Decrypt
 $GPG --quiet --use-agent -d "$KEYDIR/$FILE"

diff --git a/lib/keyringer/actions/del b/lib/keyringer/actions/del
index a2514d7c9819a7a39a564a452a288cabc719981d..d160ac4d1972bc7273610a75cc6a0a1cbaeb3fbc 100755 (executable)
--- a/lib/keyringer/actions/del
+++ b/lib/keyringer/actions/del
@@ -8,7 +8,7 @@ LIB="`dirname $0`/../functions"
 source "$LIB" || exit 1
 
 # Get file
-keyringer_get_file "$RELATIVE_PATH/$2"
+keyringer_get_file "$2"
 
 # Set options
 if [ ! -z "$3" ]; then

diff --git a/lib/keyringer/actions/edit b/lib/keyringer/actions/edit
index d303bd5f5932e4c7da9670486247fc486ec646d3..9a3e4881929c46dc96bfdf4f7815f41af6e3e428 100755 (executable)
--- a/lib/keyringer/actions/edit
+++ b/lib/keyringer/actions/edit
@@ -8,7 +8,7 @@ LIB="`dirname $0`/../functions"
 source "$LIB" || exit 1
 
 # Get file
-keyringer_get_file "$RELATIVE_PATH/$2"
+keyringer_get_file "$2"
 
 # Set recipients file
 keyringer_set_recipients "$FILE"

diff --git a/lib/keyringer/actions/encrypt b/lib/keyringer/actions/encrypt
index 526eaa180269c93ab7d14687460d6c51058335da..0a40bc18b92988f6b895365dc93a4845279802da 100755 (executable)
--- a/lib/keyringer/actions/encrypt
+++ b/lib/keyringer/actions/encrypt
@@ -65,7 +65,7 @@ if [ ! -z "$3" ]; then
     FILE="$BASEPATH"
   fi
 
-  keyringer_get_new_file $RELATIVE_PATH/$FILE
+  keyringer_get_new_file $FILE
 
   if [ ! -e "$UNENCRYPTED_FILE" ]; then
     echo "Error: cannot encrypt $UNENCRYPTED_FILE: path not found."
@@ -74,7 +74,7 @@ if [ ! -z "$3" ]; then
 else
   UNENCRYPTED_FILE="-"
   shift
-  keyringer_get_new_file $RELATIVE_PATH/$*
+  keyringer_get_new_file $*
 fi
 
 # Set recipients file

diff --git a/lib/keyringer/actions/recrypt b/lib/keyringer/actions/recrypt
index 7d5c6ae0c323ebdebe55b7142563be0a823d1371..014fef71539774368473cc746f425577f858c2dd 100755 (executable)
--- a/lib/keyringer/actions/recrypt
+++ b/lib/keyringer/actions/recrypt
@@ -9,7 +9,7 @@ source "$LIB" || exit 1
 
 function keyringer_recrypt {
   # Get file
-  keyringer_get_file "$RELATIVE_PATH/$1"
+  keyringer_get_file "$1"
 
   # Set recipients file
   keyringer_set_recipients "$FILE"

diff --git a/lib/keyringer/functions b/lib/keyringer/functions
index f387c464ff4cc34ef5106d94cf71b002d8219b37..872dac9c0025c9ab8d661dc7d498aeb938cc6cc3 100755 (executable)
--- a/lib/keyringer/functions
+++ b/lib/keyringer/functions
@@ -398,7 +398,7 @@ function keyringer_upgrade {
 
 # Get a file argument
 function keyringer_get_file {
-  FILE="$(keyringer_filename "$1")"
+  FILE="$(keyringer_filename "$RELATIVE_PATH/$1")"
   
   if [ -z "$FILE" ]; then
     keyringer_action_usage
@@ -427,7 +427,7 @@ function keyringer_get_new_file {
   fi
 
   # Complete file name
-  FILE="$(keyringer_filename "$FILE")"
+  FILE="$RELATIVE_PATH/$(keyringer_filename "$FILE")"
 
   if [ -z "$*" ]; then
     keyringer_action_usage