[tbb-commits] [builders/tor-browser-build] 06/09: Bug 40476: Use gpg with --batch --no-tty in linux-signer-gpg-sign

[gitolite role]

This is an automated email from the git hooks/post-receive script.

richard pushed a commit to branch master
in repository builders/tor-browser-build.

commit 6e76d18786f28db77fc1ab7e5020fd357e79effc
Author: Nicolas Vigier <boklm at torproject.org>
AuthorDate: Sat Apr 30 12:02:00 2022 +0200

    Bug 40476: Use gpg with --batch --no-tty in linux-signer-gpg-sign
    
    Use --batch --no-tty to avoid an error when running the script without
    a tty:
    
      gpg: cannot open tty `/dev/tty`: No such device or address
---
 .../download-unsigned-sha256sums-gpg-signatures-from-people-tpo        | 3 ++-
 tools/signing/linux-signer-gpg-sign                                    | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/tools/signing/download-unsigned-sha256sums-gpg-signatures-from-people-tpo b/tools/signing/download-unsigned-sha256sums-gpg-signatures-from-people-tpo
index 0754329..5aadc00 100755
--- a/tools/signing/download-unsigned-sha256sums-gpg-signatures-from-people-tpo
+++ b/tools/signing/download-unsigned-sha256sums-gpg-signatures-from-people-tpo
@@ -10,7 +10,8 @@ do
     tmpfile=$(mktemp)
     chmod 644 "$tmpfile"
     wget -q -O "$tmpfile" "https://people.torproject.org/~$builder/builds/$tbb_version-build$tbb_version_build/$file" || \
-      wget -q -O "$tmpfile" "https://people.torproject.org/~$builder/builds/tor-browser/release/unsigned/$tbb_version-build$tbb_version_build/$file" && \
+      wget -q -O "$tmpfile" "https://people.torproject.org/~$builder/builds/tor-browser/$tbb_version-build$tbb_version_build/$file" || \
+      wget -q -O "$tmpfile" "https://tb-build-03.torproject.org/~$builder/builds/tor-browser/$tbb_version_type/unsigned/$tbb_version-build$tbb_version_build/$file" && \
       mv "$tmpfile" "$signed_version_dir/$file-$builder" && echo "Added $file-$builder"
   done
 done
diff --git a/tools/signing/linux-signer-gpg-sign b/tools/signing/linux-signer-gpg-sign
index 35058df..aeb4a52 100755
--- a/tools/signing/linux-signer-gpg-sign
+++ b/tools/signing/linux-signer-gpg-sign
@@ -15,5 +15,5 @@ do
     rm -f "$i.asc"
   fi
   echo "Signing $i"
-  echo "$GPG_PASS" | gpg -absu 0xe53d989a9e2d47bf! --passphrase-fd 0 $i
+  echo "$GPG_PASS" | gpg -absu 0xe53d989a9e2d47bf! --batch --no-tty --passphrase-fd 0 $i
 done

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.