Gitweb:
https://git.exim.org/exim.git/commitdiff/b2758501d772f37e5baa22ed2c379f0a473cffc2
Commit: b2758501d772f37e5baa22ed2c379f0a473cffc2
Parent: 525c441c8defd07ec9c1c235eb8ac4da304d70be
Author: Heiko Schlittermann (HS12-RIPE) <hs@???>
AuthorDate: Thu Dec 13 22:48:08 2018 +0100
Committer: Heiko Schlittermann (HS12-RIPE) <hs@???>
CommitDate: Thu Dec 13 23:11:38 2018 +0100
sign_exim_package: do not auto-select the packages directory
---
release-process/scripts/sign_exim_packages | 27 +++++++++++++--------------
1 file changed, 13 insertions(+), 14 deletions(-)
diff --git a/release-process/scripts/sign_exim_packages b/release-process/scripts/sign_exim_packages
index a504ea8..e768409 100755
--- a/release-process/scripts/sign_exim_packages
+++ b/release-process/scripts/sign_exim_packages
@@ -40,24 +40,24 @@ case "${EXIM_KEY:-default}" in
default|DEFAULT)
gpg_sign() { ${GPG_COMMAND} --detach-sig --armor "${1:?}" ; }
;;
-*)
+*)
gpg_sign() { ${GPG_COMMAND} --local-user "${EXIM_KEY}" --detach-sig --armor "${1:?}" ; }
;;
esac
cd_to() { echo "Working in: $1"; cd "$1"; }
-okay=false
-if [ -d ../../release-process ] && [ "${PWD##*/}" = "pkgs" ]; then
- okay=true # we are in right dir
-elif [ -d release-process ]; then
- b="$(find . -maxdepth 1 -name 'exim-packaging-*' | sort | tail -n 1)"
- if [ ".$b" != "." ]; then
- cd_to "$b/pkgs"
- okay=true
- fi
-fi
-if ! $okay; then
+#okay=false
+#if [ -d ../../release-process ] && [ "${PWD##*/}" = "pkgs" ]; then
+# okay=true # we are in right dir
+#elif [ -d release-process ]; then
+# b="$(find . -maxdepth 1 -name 'exim-packaging-*' | sort | tail -n 1)"
+# if [ ".$b" != "." ]; then
+# cd_to "$b/pkgs"
+# okay=true
+# fi
+#fi
+#if ! $okay; then
if [ -d "${1:?need a directory to look in}" ]; then
cd_to "$1"
shift
@@ -65,11 +65,10 @@ if ! $okay; then
printf "%s: %s\n" >&2 "$(basename "$0")" "where should I be looking"
exit 1
fi
-fi
+#fi
# Assumes no whitespace (strictly, $IFS) in filenames, which we're okay with
set $(find . -name '*.asc' -prune -o -type f -print | cut -c 3- | sort)
-
for FILE
do
echo "Signing: $FILE"
