cleanup
This commit is contained in:
@@ -21,7 +21,7 @@ checkcode () {
|
||||
if [ $retcode -ne 0 ]; then
|
||||
echo -e "\e[31mERROR!\033[0m Response Code: $retcode"
|
||||
else
|
||||
printf '\e[1;32mOK!\e[0m\n'
|
||||
printf ' \e[1;32mOK!\e[0m\n'
|
||||
fi
|
||||
}
|
||||
|
||||
@@ -56,7 +56,7 @@ rm -rf "$inner_dir" > /dev/null 2>&1
|
||||
checkcode $?
|
||||
|
||||
printf "ssh: signing out/contents.7z"
|
||||
ssh-keygen -Y sign -f "$key_path" -n "$signature_tag" "$out_dir/contents.7z" # > /dev/null 2>&1
|
||||
ssh-keygen -Y sign -f "$key_path" -n "$signature_tag" "$out_dir/contents.7z" > /dev/null 2>&1
|
||||
checkcode $?
|
||||
|
||||
printf "sha512: generating sha512 checksums of files in out"
|
||||
@@ -69,14 +69,14 @@ echo
|
||||
echo "Enter attribution passphrase again:"
|
||||
read -r -s attribution_passphrase_check
|
||||
if [[ "$attribution_passphrase" != "$attribution_passphrase_check" ]]; then
|
||||
echo -e "\n\n\033[0;31mAttribution passphrases do not match! Exiting!\033[0m\n\n" >&2
|
||||
echo -e "\n\n\033[0;31mAttribution passphrases do not match! Exiting!\033[0m\n\n" > /dev/null > /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
|
||||
unset attribution_passphrase > /dev/null 2>&1
|
||||
unset attribution_passphrase_check > /dev/null > /dev/null 2>&1
|
||||
unset attribution_passphrase > /dev/null > /dev/null 2>&1
|
||||
{
|
||||
printf '%s' "$attribution_passphrase"
|
||||
cat "$out_dir/contents.7z"
|
||||
@@ -96,14 +96,25 @@ unset attribution_passphrase > /dev/null 2>&1
|
||||
# checkcode $?
|
||||
|
||||
printf "7z archiving outer dir"
|
||||
7z a "./out.7z" "$out_dir" > /dev/null 2>&1
|
||||
7z a "./out.7z" "$out_dir" > /dev/null > /dev/null 2>&1
|
||||
checkcode $?
|
||||
printf "moving out.7z to archives"
|
||||
mv out.7z "archives/verifiable_archive_${unix_seconds}.7z"
|
||||
mv out.7z "archives/verifiable_archive_${unix_seconds}.7z" > /dev/null 2>&1
|
||||
checkcode $?
|
||||
|
||||
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
|
||||
|
||||
printf "archivin keys"
|
||||
7z a "keystore/keystore_${unix_seconds}.7z" "private_*" "private_*.pub" "attribution_passphrase_${unix_seconds}.txt"
|
||||
7z a "keystore/keystore_${unix_seconds}.7z" "private_*" "private_*.pub" "attribution_passphrase_${unix_seconds}.txt" > /dev/null 2>&1
|
||||
checkcode $?
|
||||
|
||||
printf "resetting environment..."
|
||||
|
||||
Reference in New Issue
Block a user