diff --git a/create-attributable-archive.sh b/create-attributable-archive.sh index a32c647..d213c49 100755 --- a/create-attributable-archive.sh +++ b/create-attributable-archive.sh @@ -111,19 +111,19 @@ checkcode $? # echo echo "Enter attribution passphrase:" -read attribution_passphrase -# echo -# echo "Enter attribution passphrase again:" -# read -r -s attribution_passphrase_check -# echo -# if [[ "$attribution_passphrase" != "$attribution_passphrase_check" ]]; then -# echo -e "\n\n\033[0;31mAttribution passphrases do not match! Exiting!\033[0m\n\n" > /dev/null 2>&1 -# exit 1 -# else -# echo -e "attribution_passphrase: \033[0;32mOK!\033[0m" -# echo "$attribution_passphrase" > "attribution_passphrase_${unix_seconds}.txt" -# fi -# unset attribution_passphrase_check > /dev/null 2>&1 +read -r -s attribution_passphrase +echo +echo "Enter attribution passphrase again:" +read -r -s attribution_passphrase_check +echo +if [[ "$attribution_passphrase" != "$attribution_passphrase_check" ]]; then + echo -e "\n\n\033[0;31mAttribution passphrases do not match! Exiting!\033[0m\n\n" > /dev/null 2>&1 + exit 1 +else + echo -e "attribution_passphrase: \033[0;32mOK!\033[0m" + echo "$attribution_passphrase" > "attribution_passphrase_${unix_seconds}.txt" +fi +unset attribution_passphrase_check > /dev/null 2>&1 { printf "$attribution_passphrase" cat "$out_dir/contents.7z" @@ -150,18 +150,18 @@ printf "moving out.7z to archives..." mv out.7z "archives/verifiable_archive_${unix_seconds}.7z" > /dev/null 2>&1 checkcode $? -# echo -# echo "input keystore passphrase:" -# read -r -s keystore_passphrase -# echo -# echo "input keystore passphrase (again):" -# read -r -s keystore_passphrase_check -# echo -# if [[ "$keystore_passphrase" != "$keystore_passphrase_check" ]]; then -# echo -e "\n\n\033[0;31mKeystore passphrases do not match! Exiting!\033[0m\n\n" > /dev/null 2>&1 -# exit 1 -# fi -# unset keystore_passphrase_check > /dev/null 2>&1 +echo +echo "input keystore passphrase:" +read -r -s keystore_passphrase +echo +echo "input keystore passphrase (again):" +read -r -s keystore_passphrase_check +echo +if [[ "$keystore_passphrase" != "$keystore_passphrase_check" ]]; then + echo -e "\n\n\033[0;31mKeystore passphrases do not match! Exiting!\033[0m\n\n" > /dev/null 2>&1 + exit 1 +fi +unset keystore_passphrase_check > /dev/null 2>&1 printf "archivin keys..." 7z a "keystore/keystore_${unix_seconds}.7z" "private_*" "private_*.pub" "attribution_passphrase_${unix_seconds}.txt" -p"$keystore_passphrase" -mhe=on # > /dev/null 2>&1 @@ -171,7 +171,7 @@ printf "testing key archive..." 7z t "keystore/keystore_${unix_seconds}.7z" -p"$keystore_passphrase" # > /dev/null 2>&1 checkcode $? -# unset keystore_passphrase +unset keystore_passphrase printf "resetting environment..." bash reset.sh