From b35c09609bf6e1f93bc7540a5d2f60467bff9e07 Mon Sep 17 00:00:00 2001
From: Jon Warbrick <jw35@cam.ac.uk>
Date: Sun, 8 Mar 2015 19:59:55 +0000
Subject: [PATCH] Avoid needing blackbox scripts on $PATH

blackbox_edit and blackbox_cat use other blackbox scripts internally,
but assume that they will be found on $PATH. In testing it's useful to
be able to run these scripts by pathname without first putting them on
$PATH, and all the other scripts work just fine in these circumstances.

This edit fixes this by prefixing all references to other scripts in
blackbox_edit and blackbox_cat with ${blackbox_home}, which is conveniently
set as part of sourcing _blackbox_common.sh.
---
 bin/blackbox_cat  | 2 +-
 bin/blackbox_edit | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/bin/blackbox_cat b/bin/blackbox_cat
index 6264d99..0eb8f99 100755
--- a/bin/blackbox_cat
+++ b/bin/blackbox_cat
@@ -11,7 +11,7 @@ for param in """$@""" ; do
   shreddable=0
   unencrypted_file=$(get_unencrypted_filename "$param")
   if [[ ! -e "$unencrypted_file" ]]; then
-    blackbox_edit_start "$param"
+    "${blackbox_home}/blackbox_edit_start" "$param"
     shreddable=1
   fi
   cat "$unencrypted_file"
diff --git a/bin/blackbox_edit b/bin/blackbox_edit
index b9b123e..432cf0d 100755
--- a/bin/blackbox_edit
+++ b/bin/blackbox_edit
@@ -13,7 +13,7 @@ for param in """$@""" ; do
     read -r -p "Encrypt file $param? (y/n) " ans
     case "$ans" in
       y* | Y*)
-        blackbox_register_new_file "$param"
+        "${blackbox_home}/blackbox_register_new_file" "$param"
         ;;
       *)
         echo 'Skipping...'
@@ -21,7 +21,7 @@ for param in """$@""" ; do
         ;;
     esac
   fi
-  blackbox_edit_start "$param"
+  "${blackbox_home}/blackbox_edit_start" "$param"
   "$EDITOR" "$(get_unencrypted_filename "$param")"
-  blackbox_edit_end "$param"
+  "${blackbox_home}/blackbox_edit_end" "$param"
 done