diff options
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/applygnupgdefaults | 4 | ||||
| -rwxr-xr-x | tools/gpg-authcode-sign.sh | 4 | ||||
| -rwxr-xr-x | tools/mail-signed-keys | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/tools/applygnupgdefaults b/tools/applygnupgdefaults index 316509faf..921e46986 100755 --- a/tools/applygnupgdefaults +++ b/tools/applygnupgdefaults @@ -31,11 +31,11 @@ fi # Cleanup on exit cleanup () { - [ -n "$errorfile" -a -f "$errorfile" ] && rm "$errorfile" + [ -n "$errorfile" ] && [ -f "$errorfile" ] && rm "$errorfile" } trap cleanup EXIT SIGINT SIGHUP SIGPIPE errorfile=$(mktemp "/tmp/$PGM.log.XXXXXX") -[ -n "$errorfile" -a -f "$errorfile" ] || exit 2 +{ [ -n "$errorfile" ] && [ -f "$errorfile" ]; } || exit 2 # Check whether we can use getent if getent --help </dev/null >/dev/null 2>&1 ; then diff --git a/tools/gpg-authcode-sign.sh b/tools/gpg-authcode-sign.sh index 91e33bcec..ad4d1450c 100755 --- a/tools/gpg-authcode-sign.sh +++ b/tools/gpg-authcode-sign.sh @@ -101,7 +101,7 @@ dryrun= stamp= buildtype= # Set defaults according to our build system. -if [ -n "$abs_top_srcdir" -a -f "$abs_top_srcdir/packages/BUILDTYPE" ]; then +if [ -n "$abs_top_srcdir" ] && [ -f "$abs_top_srcdir/packages/BUILDTYPE" ]; then buildtype=$(cat "$abs_top_srcdir/packages/BUILDTYPE") elif [ -f "../packages/BUILDTYPE" ]; then buildtype=$(cat "../packages/BUILDTYPE") @@ -190,7 +190,7 @@ fi # Define the cleanup routine for osslsigncode cleanup() { - if [ -n "$outname" -a -f "${outname}.tmp" ]; then + if [ -n "$outname" ] && [ -f "${outname}.tmp" ]; then echo >&2 "Cleaning up: Removing ${outname}.tmp" rm -f "${outname}.tmp" fi diff --git a/tools/mail-signed-keys b/tools/mail-signed-keys index 263b8e535..540293c3b 100755 --- a/tools/mail-signed-keys +++ b/tools/mail-signed-keys @@ -17,7 +17,7 @@ if [ "$1" = "--dry-run" ]; then shift fi -if [ -z "$1" -o -z "$2" -o -z "$3" ]; then +if [ -z "$1" ] || [ -z "$2" ] || [ -z "$3" ]; then echo "usage: mail-signed-keys keyring signedby signame" >&2 exit 1 fi @@ -44,7 +44,7 @@ if [ "$dryrun" = "0" ]; then echo "About to send the keys signed by $signedby" >&2 echo -n "to their owners. Do you really want to do this? (y/N)" >&2 read - [ "$REPLY" != "y" -a "$REPLY" != "Y" ] && exit 0 + [ "$REPLY" != "y" ] && [ "$REPLY" != "Y" ] && exit 0 fi gpg $ro --check-sigs --with-colons 2>/dev/null \ |