george/blackbox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Avoid needing blackbox scripts on $PATH

Browse Source 
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.
This commit is contained in:
Jon Warbrick
2015-03-08 19:59:55 +00:00
parent 65a1c938ab
commit b35c09609b
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
bin/blackbox_cat
View File

@@ -11,7 +11,7 @@ for param in """$@""" ; do
shreddable=0 shreddable=0
unencrypted_file=$(get_unencrypted_filename "$param") unencrypted_file=$(get_unencrypted_filename "$param")
if [[ ! -e "$unencrypted_file" ]]; then if [[ ! -e "$unencrypted_file" ]]; then
blackbox_edit_start "$param" "${blackbox_home}/blackbox_edit_start" "$param"
shreddable=1 shreddable=1
fi fi
cat "$unencrypted_file" cat "$unencrypted_file"

6
bin/blackbox_edit
View File

@@ -13,7 +13,7 @@ for param in """$@""" ; do
read -r -p "Encrypt file $param? (y/n) " ans read -r -p "Encrypt file $param? (y/n) " ans
case "$ans" in case "$ans" in
y* | Y*) y* | Y*)
blackbox_register_new_file "$param" "${blackbox_home}/blackbox_register_new_file" "$param"
;; ;;
*) *)
echo 'Skipping...' echo 'Skipping...'
@@ -21,7 +21,7 @@ for param in """$@""" ; do
;; ;;
esac esac
fi fi
blackbox_edit_start "$param" "${blackbox_home}/blackbox_edit_start" "$param"
"$EDITOR" "$(get_unencrypted_filename "$param")" "$EDITOR" "$(get_unencrypted_filename "$param")"
blackbox_edit_end "$param" "${blackbox_home}/blackbox_edit_end" "$param"
done done