diff --git a/how-to-create-encrypted-paper-backup/README.md b/how-to-create-encrypted-paper-backup/README.md index 1abf7b9..3f0bbcd 100644 --- a/how-to-create-encrypted-paper-backup/README.md +++ b/how-to-create-encrypted-paper-backup/README.md @@ -136,7 +136,7 @@ qr-backup.sh ### Restore encrypted paper backup -> Heads-up: use `--split-words` to split secret into word list. +> Heads-up: use `--word-list` to split secret into word list. ```shell qr-restore.sh diff --git a/how-to-create-encrypted-paper-backup/qr-backup.sh b/how-to-create-encrypted-paper-backup/qr-backup.sh index 0dbaec0..c6d8c93 100755 --- a/how-to-create-encrypted-paper-backup/qr-backup.sh +++ b/how-to-create-encrypted-paper-backup/qr-backup.sh @@ -89,7 +89,7 @@ if [ "$bip39" = true ]; then words=($secret) for word in ${words[@]}; do if ! exists $word; then - printf "$red%s$normal\n" "Invalid word $bold$word$normal" + printf "$red%s $bold%s$normal\n" "Invalid word" "$word" exit 1 fi done @@ -102,8 +102,8 @@ encrypted_secret_hash=$(echo -n "$encrypted_secret" | openssl dgst -sha512 | sed encrypted_secret_short_hash=$(echo -n "$encrypted_secret_hash" | head -c 8) printf "%s\n" "$encrypted_secret" -printf "SHA512 hash: $bold%s$normal\n" "$encrypted_secret_hash" -printf "SHA512 short hash: $bold%s$normal\n" "$encrypted_secret_short_hash" +printf "%s: $bold%s$normal\n" "SHA512 hash" "$encrypted_secret_hash" +printf "%s: $bold%s$normal\n" "SHA512 short hash" "$encrypted_secret_short_hash" echo -n "$encrypted_secret" | qr --error-correction=H > "$tmp/secret.png" diff --git a/how-to-create-encrypted-paper-backup/qr-backup.sh.sig b/how-to-create-encrypted-paper-backup/qr-backup.sh.sig index 613d2df..7bbce08 100644 Binary files a/how-to-create-encrypted-paper-backup/qr-backup.sh.sig and b/how-to-create-encrypted-paper-backup/qr-backup.sh.sig differ diff --git a/how-to-create-encrypted-paper-backup/qr-clone.sh b/how-to-create-encrypted-paper-backup/qr-clone.sh index 05aefd8..6a1945a 100755 --- a/how-to-create-encrypted-paper-backup/qr-clone.sh +++ b/how-to-create-encrypted-paper-backup/qr-clone.sh @@ -2,6 +2,8 @@ set -e +tput reset + printf "%s\n" "Restoringā€¦" . qr-restore.sh diff --git a/how-to-create-encrypted-paper-backup/qr-clone.sh.sig b/how-to-create-encrypted-paper-backup/qr-clone.sh.sig index 9224164..670a738 100644 Binary files a/how-to-create-encrypted-paper-backup/qr-clone.sh.sig and b/how-to-create-encrypted-paper-backup/qr-clone.sh.sig differ diff --git a/how-to-create-encrypted-paper-backup/qr-restore.sh b/how-to-create-encrypted-paper-backup/qr-restore.sh index 72a9b0e..07634ea 100755 --- a/how-to-create-encrypted-paper-backup/qr-restore.sh +++ b/how-to-create-encrypted-paper-backup/qr-restore.sh @@ -6,8 +6,8 @@ positional=() while [[ $# -gt 0 ]]; do argument="$1" case $argument in - --split-words) - split_words=true + --word-list) + word_list=true shift ;; *) @@ -23,6 +23,8 @@ bold=$(tput bold) red=$(tput setaf 1) normal=$(tput sgr0) +tput reset + printf "%s\n" "Scan QR codeā€¦" data="" @@ -45,8 +47,8 @@ encrypted_secret_hash=$(echo -n "$encrypted_secret" | openssl dgst -sha512 | sed encrypted_secret_short_hash=$(echo -n "$encrypted_secret_hash" | head -c 8) printf "%s\n" "$encrypted_secret" -printf "SHA512 hash: $bold%s$normal\n" "$encrypted_secret_hash" -printf "SHA512 short hash: $bold%s$normal\n" "$encrypted_secret_short_hash" +printf "%s: $bold%s$normal\n" "SHA512 hash" "$encrypted_secret_hash" +printf "%s: $bold%s$normal\n" "SHA512 short hash" "$encrypted_secret_short_hash" printf "$bold$red%s$normal\n" "Show secret? (y or n)? " @@ -54,12 +56,12 @@ read -r answer if [ "$answer" = "y" ]; then secret=$(echo -e "$encrypted_secret" | gpg --decrypt) gpg-connect-agent reloadagent /bye > /dev/null 2>&1 - if [ "$split_words" = true ]; then + if [ "$word_list" = true ]; then printf "%s" "Secret: " array=($secret) for i in ${!array[@]}; do position=$(($i + 1)) - printf "%s" "$position.$bold${array[$i]}$normal " + printf "%d. $bold%s$normal " "$position" "${array[$i]}" done printf "\n" else diff --git a/how-to-create-encrypted-paper-backup/qr-restore.sh.sig b/how-to-create-encrypted-paper-backup/qr-restore.sh.sig index b8898bd..3419977 100644 Binary files a/how-to-create-encrypted-paper-backup/qr-restore.sh.sig and b/how-to-create-encrypted-paper-backup/qr-restore.sh.sig differ