sum updoots

create-attributable-archive.sh

@@ -136,7 +136,7 @@ printf "sanity checking: verification..."
 bash verify-everything.sh
 checkcode $?
 printf "sanity checking: validate attribution passphrase..."
-bash test_validate_passphrase.sh
+bash test_validate_passphrase.sh "$attribution_passphrase"
 checkcode $?
 printf "sanity checking: returning..."
 cd ..
@@ -159,18 +159,20 @@ 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
+else
+    echo -e "keystore passphrases... \e[1;32mOK!\e[0m"
 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
+7z a "keystore/keystore_${unix_seconds}.7z" "private_*" "attribution_passphrase_${unix_seconds}.txt" -p"$keystore_passphrase" -mhe=on # > /dev/null 2>&1
 checkcode $?
 
 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 > /dev/null 2>&1
 
 printf "resetting environment..."
 reset