diff options
| author | Christian Pointner <equinox@spreadspace.org> | 2020-05-04 10:19:57 +0200 |
|---|---|---|
| committer | Christian Pointner <equinox@spreadspace.org> | 2020-05-04 10:19:57 +0200 |
| commit | 4bee47b27c247ade1da0dad1e103c90fe72101cd (patch) | |
| tree | 25ff0e72bc7630aa00699ed5d11ff07b1acfdd15 /gpg | |
| parent | ch-equinox-ws: add games (diff) | |
gpg: minor cleanup
Diffstat (limited to 'gpg')
| -rwxr-xr-x | gpg/add-key.sh | 6 | ||||
| -rwxr-xr-x | gpg/create-environment.sh | 2 | ||||
| -rwxr-xr-x | gpg/remove-keys.sh | 6 | ||||
| -rwxr-xr-x | gpg/set-vault-pass.sh | 2 |
4 files changed, 8 insertions, 8 deletions
diff --git a/gpg/add-key.sh b/gpg/add-key.sh index 82970a91..b07539fe 100755 --- a/gpg/add-key.sh +++ b/gpg/add-key.sh @@ -13,7 +13,7 @@ fi "${BASH_SOURCE%/*}/gpg2.sh" "$NAME" --import "$@" if [ $? -ne 0 ]; then - echo -e "\nERROR: importing key(s) failed. Please revert any changes of the file gpg/vault-keyring-$NAME.gpg." + echo -e "\nERROR: importing key(s) failed. Please revert any changes of the file ${0%/*}/vault-keyring-$NAME.gpg." exit 1 fi @@ -21,8 +21,8 @@ echo "" "${BASH_SOURCE%/*}/get-vault-pass-$NAME" | "${BASH_SOURCE%/*}/set-vault-pass.sh" "$NAME" if [ $? -ne 0 ]; then echo -e "\nERROR: reencrypting vault password file failed!" - echo " You might want to revert any changes on gpg/vault-pass-$NAME.gpg and gpg/vault-keyring-$NAME.gpg!!" + echo " You might want to revert any changes on ${0%/*}/vault-pass-$NAME.gpg and ${0%/*}/vault-keyring-$NAME.gpg!!" exit 1 fi echo "Successfully reencrypted vault password file!" -echo " Don't forget to commit the changes in gpg/vault-pass-$NAME.gpg and gpg/vault-keyring-$NAME.gpg." +echo " Don't forget to commit the changes in ${0%/*}/vault-pass-$NAME.gpg and ${0%/*}/vault-keyring-$NAME.gpg." diff --git a/gpg/create-environment.sh b/gpg/create-environment.sh index 7ee5827b..5334a85b 100755 --- a/gpg/create-environment.sh +++ b/gpg/create-environment.sh @@ -37,4 +37,4 @@ if [ $? -ne 0 ]; then fi echo "" echo "Successfully created vault password file!" -echo " Don't forget to commit gpg/get-vault-pass-$NAME, gpg/vault-pass-$NAME.gpg and gpg/vault-keyring-$NAME.gpg." +echo " Don't forget to commit ${0%/*}/get-vault-pass-$NAME, ${0%/*}/vault-pass-$NAME.gpg and ${0%/*}/vault-keyring-$NAME.gpg." diff --git a/gpg/remove-keys.sh b/gpg/remove-keys.sh index d5fd93c3..51d8c079 100755 --- a/gpg/remove-keys.sh +++ b/gpg/remove-keys.sh @@ -27,7 +27,7 @@ fi "${BASH_SOURCE%/*}/gpg2.sh" $NAME --delete-keys $@ if [ $? -ne 0 ]; then - echo -e "\nERROR: removing key(s) failed. Please revert any changes of the file gpg/vault-keyring-$NAME.gpg." + echo -e "\nERROR: removing key(s) failed. Please revert any changes of the file ${0%/*}/vault-keyring-$NAME.gpg." exit 1 fi @@ -35,8 +35,8 @@ echo "" "${BASH_SOURCE%/*}/get-vault-pass-$NAME" | "${BASH_SOURCE%/*}/set-vault-pass.sh" "$NAME" if [ $? -ne 0 ]; then echo -e "\nERROR: reencrypting vault password file failed!" - echo " You might want to revert any changes on gpg/vault-pass-$NAME.gpg and gpg/vault-keyring-$NAME.gpg!!" + echo " You might want to revert any changes on ${0%/*}/vault-pass-$NAME.gpg and ${0%/*}/vault-keyring-$NAME.gpg!!" exit 1 fi echo "Successfully reencrypted vault password file!" -echo " Don't forget to commit the changes in gpg/vault-pass-$NAME.gpg and gpg/vault-keyring-$NAME.gpg." +echo " Don't forget to commit the changes in ${0%/*}/vault-pass-$NAME.gpg and ${0%/*}/vault-keyring-$NAME.gpg." diff --git a/gpg/set-vault-pass.sh b/gpg/set-vault-pass.sh index 64191a37..123d6af7 100755 --- a/gpg/set-vault-pass.sh +++ b/gpg/set-vault-pass.sh @@ -19,7 +19,7 @@ for keyid in $keyids; do done -"${BASH_SOURCE%/*}/gpg2.sh" "$NAME" --yes --encrypt -a -o "${BASH_SOURCE%/*}/vault-pass-$NAME.gpg.$$" $receipients +"${BASH_SOURCE%/*}/gpg2.sh" "$NAME" --yes --trust-model always --encrypt -a -o "${BASH_SOURCE%/*}/vault-pass-$NAME.gpg.$$" $receipients if [ $? -ne 0 ]; then rm -f "${BASH_SOURCE%/*}/vault-pass-$NAME.gpg.$$" exit 1 |