cleanup

create-attributable-archive.sh

@@ -25,6 +25,10 @@ checkcode () {
     fi
 }
 
+printf "setting up environment..."
+bash reset.sh
+checkcode $?
+
 printf "ssh-keygen: makin new key..."
 ssh-keygen -t ed25519 -f "$key_path" -C "anonymous"
 checkcode $?
@@ -48,7 +52,7 @@ printf "7z: compressing inner volume"
 checkcode $?
 
 printf "deleting $inner_dir"
-rm -rf "$inner_dir"
+rm -rf "$inner_dir" > /dev/null 2>&1
 checkcode $?
 
 printf "ssh: signing out/contents.7z"
@@ -71,8 +75,8 @@ else
     echo -e "attribution_passphrase: \033[0;32mOK!\033[0m"
     echo "$attribution_passphrase" > "attribution_passphrase_${unix_seconds}.txt"
 fi
-unset attribution_passphrase_check
-unset attribution_passphrase
+unset attribution_passphrase_check > /dev/null 2>&1
+unset attribution_passphrase > /dev/null 2>&1
 {
     printf '%s' "$attribution_passphrase"
     cat "$out_dir/contents.7z"
@@ -92,13 +96,18 @@ unset attribution_passphrase
 # checkcode $?
 
 printf "7z archiving outer dir"
-7z a "./out.7z" "$out_dir"
+7z a "./out.7z" "$out_dir" > /dev/null 2>&1
 checkcode $?
 printf "moving out.7z to archives"
-mv out.7z "archives/out_${unix_seconds}.7z"
+mv out.7z "archives/verifiable_archive_${unix_seconds}.7z"
 checkcode $?
-bash reset.sh
 
 printf "archivin keys"
-7z a "keystore/keystore_${unix_seconds}.7z" "$key_store" "${key_store}.pub" "attribution_passphrase_${unix_seconds}.txt" "attribution_passphrase_${unix_seconds}.txt"
+7z a "keystore/keystore_${unix_seconds}.7z" "private_*" "private_*.pub" "attribution_passphrase_${unix_seconds}.txt"
 checkcode $?
+
+printf "resetting environment..."
+bash reset.sh
+checkcode $?
+
+echo "done :3"