From 70df12522e8fd2a423fd90f00d612995bcb53b72 Mon Sep 17 00:00:00 2001 From: Lucio Andrés Illanes Albornoz (arab, vxp) Date: May 27 2016 10:03:34 +0000 Subject: Followup to last commit. --- diff --git a/build.sh b/build.sh index 736b4d2..bc310c5 100755 --- a/build.sh +++ b/build.sh @@ -122,9 +122,9 @@ if [ $(( ${BUILD_NFINI} + ${BUILD_NSKIP} )) -ge 0 ] \ -mindepth 1 -maxdepth 2 -type d -not -path ./native) \ "Create \`Midipix mintty shell' shortcut.vbs" midipix.sh; log_msg info "Finished building distribution tarball."; - if [ -x $(which gpg 2>/dev/null) -a -n "${TARBALL_SRC_SIGN_GPG_KEY}" ] &&\ + if [ -x "$(which gpg 2>/dev/null)" -a -n "${TARBALL_SRC_SIGN_GPG_KEY}" ] &&\ gpg --list-keys "${TARBALL_SRC_SIGN_GPG_KEY}" >/dev/null 2>&1; then - gpg --armor --passphrase-file /dev/null \ + gpg --passphrase-file /dev/null \ --local-user "${TARBALL_SRC_SIGN_GPG_KEY}" --sign \ ${TARBALL_FNAME_PREFIX}${BUILD_USER}@${BUILD_HNAME}-${BUILD_DATE_START}.tar.xz; fi; @@ -135,9 +135,9 @@ if [ $(( ${BUILD_NFINI} + ${BUILD_NSKIP} )) -ge 0 ] \ $(find tmp -mindepth 1 -maxdepth 1 -type d \ \( -name \*-native-\* -or -name \*-cross-\* \)); log_msg info "Finished building source tarball."; - if [ -x $(which gpg 2>/dev/null) -a -n "${TARBALL_SIGN_GPG_KEY}" ] &&\ + if [ -x "$(which gpg 2>/dev/null)" -a -n "${TARBALL_SIGN_GPG_KEY}" ] &&\ gpg --list-keys "${TARBALL_SIGN_GPG_KEY}" >/dev/null 2>&1; then - gpg --armor --passphrase-file /dev/null \ + gpg --passphrase-file /dev/null \ --local-user "${TARBALL_SIGN_GPG_KEY}" --sign \ ${TARBALL_SRC_FNAME_PREFIX}${BUILD_USER}@${BUILD_HNAME}-${BUILD_DATE_START}.tar.xz; fi;