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

Fixed #83 blackbox_edit* scripts should accept multiple filenames

Browse Source
This commit is contained in:
tlimoncelli@stackexchange.com
2015-07-24 09:57:34 -04:00
parent 23cc07d1e3
commit 1f2d99436d
3 changed files with 40 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
bin/blackbox_edit
View File

@@ -7,20 +7,27 @@ set -e
source "${0%/*}/_blackbox_common.sh"
for param in "$@" ; do
unencrypted_file=$(get_unencrypted_filename "$param")
if ! is_on_cryptlist "$param" && ! is_on_cryptlist "$unencrypted_file" ; then
encrypted_file=$(get_encrypted_filename "$param")
echo >&2 ========== PLAINFILE '"'$unencrypted_file'"'
echo >&2 ========== ENCRYPTED '"'$encrypted_file'"'
if ! is_on_cryptlist "$encrypted_file" && ! is_on_cryptlist "$unencrypted_file" ; then
read -r -p "Encrypt file $param? (y/n) " ans
case "$ans" in
y* | Y*)
"${BLACKBOX_HOME}/blackbox_register_new_file" "$param"
"${BLACKBOX_HOME}/blackbox_register_new_file" "$unencrypted_file"
;;
*)
echo 'Skipping...'
echo >&2 'Skipping...'
continue
;;
esac
fi
"${BLACKBOX_HOME}/blackbox_edit_start" "$param"
"$EDITOR" "$(get_unencrypted_filename "$param")"
"${BLACKBOX_HOME}/blackbox_edit_end" "$param"
"${BLACKBOX_HOME}/blackbox_edit_start" "$unencrypted_file"
"$EDITOR" "$(get_unencrypted_filename "$unencrypted_file")"
"${BLACKBOX_HOME}/blackbox_edit_end" "$unencrypted_file"
done

25
bin/blackbox_edit_end
View File

@@ -7,10 +7,15 @@
set -e
source "${0%/*}/_blackbox_common.sh"
unencrypted_file=$(get_unencrypted_filename "$1")
encrypted_file=$(get_encrypted_filename "$1")
echo ========== PLAINFILE '"'$unencrypted_file'"'
echo ========== ENCRYPTED '"'$encrypted_file'"'
next_steps=()
for param in "$@" ; do
unencrypted_file=$(get_unencrypted_filename "$param")
encrypted_file=$(get_encrypted_filename "$param")
echo >&2 ========== PLAINFILE '"'$unencrypted_file'"'
echo >&2 ========== ENCRYPTED '"'$encrypted_file'"'
fail_if_not_on_cryptlist "$unencrypted_file"
fail_if_not_exists "$unencrypted_file" "No unencrypted version to encrypt!"
@@ -18,7 +23,13 @@ fail_if_keychain_has_secrets
encrypt_file "$unencrypted_file" "$encrypted_file"
shred_file "$unencrypted_file"
echo >&2 ========== UPDATED '"'$encrypted_file'"'
next_steps+=( " $VCS_TYPE commit -m\"${encrypted_file} updated\" \"$encrypted_file\"" )
echo ========== UPDATED '"'$encrypted_file'"'
echo "Likely next step:"
echo " $VCS_TYPE commit -m\"${encrypted_file} updated\" \"$encrypted_file\""
done
echo >&2 "Likely next step:"
for x in "${next_steps[@]}"
do
echo >&2 "$x"
done

4
bin/blackbox_edit_start
View File

@@ -8,8 +8,10 @@ set -e
source "${0%/*}/_blackbox_common.sh"
for param in "$@" ; do
unencrypted_file=$(get_unencrypted_filename "$param")
encrypted_file=$(get_encrypted_filename "$param")
echo >&2 ========== PLAINFILE '"'$unencrypted_file'"'
fail_if_not_on_cryptlist "$unencrypted_file"
@@ -23,5 +25,7 @@ for param in "$@" ; do
fi
prepare_keychain
# FIXME(tlim): prepare_keychain only needs to run once, outside of the loop.
decrypt_file "$encrypted_file" "$unencrypted_file"
done