diff --git a/create-attributable-archive.sh b/create-attributable-archive.sh index d213c49..7ed223b 100755 --- a/create-attributable-archive.sh +++ b/create-attributable-archive.sh @@ -1,4 +1,5 @@ #!/bin/bash +# packages: 7zip, shred, secure-delete set -e unix_seconds=$(date +%s) @@ -35,38 +36,36 @@ reset() { checkcode $? echo "autoshredding out..." - srm -r -z -l -l ./out + srm -r -z -l -l "$out_dir" checkcode $? echo "rebuilding out..." printf "making out dir structure..." - mkdir -p out/contents + mkdir -p "$inner_dir" checkcode $? - printf "updating out/contents/READMD.md..." - echo "put files to verifiably archive in here" > out/contents/README.md + printf "updating $inner_dir/READMD.md..." + echo "put files to verifiably archive in here" > "$inner_dir/README.md" checkcode $? - printf "updating out/README.md..." - echo "# todo: make this nice" > ./out/README.md + printf "updating $out_dir/README.md..." + echo "# todo: make this nice" > "$out_dir/README.md" checkcode $? - printf "making out/test_validate_passphrase.sh..." - cp test_validation_passphrase.txt out/test_validate_passphrase.sh + printf "making "$out_dir"/test_validate_passphrase.sh..." + cp test_validation_passphrase.txt "$out_dir/test_validate_passphrase.sh" checkcode $? - printf "making out/test_validate_passphrase.sh executable..." - chmod +x out/test_validate_passphrase.sh + printf "making $out_dir/test_validate_passphrase.sh executable..." + chmod +x "$out_dir/test_validate_passphrase.sh" checkcode $? - printf "making out/verify-everything.sh..." - cp verify-everything.txt out/verify-everything.sh + printf "making $out_dir/verify-everything.sh..." + cp verify-everything.txt "$out_dir"/verify-everything.sh checkcode $? - printf "making out/verify-everything.sh executable"... - chmod +x out/verify-everything.sh + printf "making $out_dir/verify-everything.sh executable"... + chmod +x "$out_dir/verify-everything.sh" checkcode $? - - echo -e "\n\033[0;32mreset done :3\033[0m\n" } printf "setting up environment..." -bash reset.sh +reset checkcode $? printf "ssh-keygen: makin new key: ${key_path}..." @@ -174,7 +173,7 @@ checkcode $? unset keystore_passphrase printf "resetting environment..." -bash reset.sh +reset checkcode $? echo -e "\n\n\033[0;32mdone :3\033[0m\n\n" diff --git a/reset.sh b/reset.sh index 58904fe..34a3f16 100755 --- a/reset.sh +++ b/reset.sh @@ -11,7 +11,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 } @@ -49,7 +49,7 @@ checkcode $? printf "making out/verify-everything.sh..." cp verify-everything.txt out/verify-everything.sh checkcode $? -printf "making out/verify-everything.sh executable"... +printf "making out/verify-everything.sh executable" chmod +x out/verify-everything.sh checkcode $?