From f8f77c14a2c35bba2cdf5b3e6746808e7c1ee963 Mon Sep 17 00:00:00 2001
From: ThomasV <thomasv@electrum.org>
Date: Tue, 27 Sep 2022 13:50:03 +0200
Subject: [PATCH] release.sh: store signing password

---
 contrib/android/make_apk   |  8 ++++----
 contrib/build-wine/sign.sh | 10 ++++++----
 contrib/release.sh         |  5 +++++
 3 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/contrib/android/make_apk b/contrib/android/make_apk
index c3d70b98b..8c3610503 100755
--- a/contrib/android/make_apk
+++ b/contrib/android/make_apk
@@ -53,12 +53,12 @@ fi
 if [[ "$3" == "release" ]] ; then
     # do release build, and sign the APKs.
     TARGET="release"
-    echo -n Keystore Password:
-    read -s password
     export P4A_RELEASE_KEYSTORE=~/.keystore
-    export P4A_RELEASE_KEYSTORE_PASSWD=$password
-    export P4A_RELEASE_KEYALIAS_PASSWD=$password
     export P4A_RELEASE_KEYALIAS=electrum
+    if [ ! $P4A_RELEASE_KEYSTORE_PASSWD ]; then
+	echo "p4a password not defined"
+	exit 1
+    fi
 elif [[ "$3" == "release-unsigned" ]] ; then
     # do release build, but do not sign the APKs.
     TARGET="release"
diff --git a/contrib/build-wine/sign.sh b/contrib/build-wine/sign.sh
index bed42edff..a9b924740 100755
--- a/contrib/build-wine/sign.sh
+++ b/contrib/build-wine/sign.sh
@@ -1,6 +1,11 @@
 #!/bin/bash
 
 here=$(dirname "$0")
+if [ ! $WIN_SIGNING_PASSWORD ]-, then
+   echo "password missing"
+   exit 1
+fi
+
 test -n "$here" -a -d "$here" || exit
 cd $here
 
@@ -21,13 +26,10 @@ mkdir -p signed >/dev/null 2>&1
 cd dist
 echo "Found $(ls *.exe | wc -w) files to sign."
 
-echo -n "Windows codesign passphrase:"
-read -s password
-
 for f in $(ls *.exe); do
     echo "Signing $f..."
     osslsigncode sign \
-      -pass $password\
+      -pass $WIN_SIGNING_PASSWORD\
       -h sha256 \
       -certs "$CERT_FILE" \
       -key "$KEY_FILE" \
diff --git a/contrib/release.sh b/contrib/release.sh
index 04664bbdd..4dd7f5d15 100755
--- a/contrib/release.sh
+++ b/contrib/release.sh
@@ -57,6 +57,11 @@ if [ "$GPGUSER" == "ThomasV" ]; then
     PUBKEY="--local-user 6694D8DE7BE8EE5631BED9502BD5824B7F9470E6"
     export SSHUSER=thomasv
     RELEASEMANAGER=1
+    echo -n "Code signing passphrase:"
+    read -s password
+    export WIN_SIGNING_PASSWORD=$password
+    export P4A_RELEASE_KEYSTORE_PASSWD=$password
+    export P4A_RELEASE_KEYALIAS_PASSWD=$password
 elif [ "$GPGUSER" == "sombernight_releasekey" ]; then
     PUBKEY="--local-user 0EEDCFD5CAFB459067349B23CA9EEEC43DF911DC"
     export SSHUSER=sombernight