1
0

build scripts: minor formatting clean-up

follow-up f8f77c14a2
This commit is contained in:
SomberNight
2022-09-27 13:25:11 +00:00
parent ef89a695db
commit f174b9164c
3 changed files with 14 additions and 9 deletions

View File

@@ -55,9 +55,9 @@ if [[ "$3" == "release" ]] ; then
TARGET="release" TARGET="release"
export P4A_RELEASE_KEYSTORE=~/.keystore export P4A_RELEASE_KEYSTORE=~/.keystore
export P4A_RELEASE_KEYALIAS=electrum export P4A_RELEASE_KEYALIAS=electrum
if [ ! $P4A_RELEASE_KEYSTORE_PASSWD ]; then if [ -z "$P4A_RELEASE_KEYSTORE_PASSWD" ] || [ -z "$P4A_RELEASE_KEYALIAS_PASSWD" ]; then
echo "p4a password not defined" echo "p4a password not defined"
exit 1 exit 1
fi fi
elif [[ "$3" == "release-unsigned" ]] ; then elif [[ "$3" == "release-unsigned" ]] ; then
# do release build, but do not sign the APKs. # do release build, but do not sign the APKs.

View File

@@ -1,9 +1,9 @@
#!/bin/bash #!/bin/bash
here=$(dirname "$0") here=$(dirname "$0")
if [ ! $WIN_SIGNING_PASSWORD ]; then if [ -z "$WIN_SIGNING_PASSWORD" ]; then
echo "password missing" echo "password missing"
exit 1 exit 1
fi fi
test -n "$here" -a -d "$here" || exit test -n "$here" -a -d "$here" || exit

View File

@@ -57,14 +57,19 @@ if [ "$GPGUSER" == "ThomasV" ]; then
PUBKEY="--local-user 6694D8DE7BE8EE5631BED9502BD5824B7F9470E6" PUBKEY="--local-user 6694D8DE7BE8EE5631BED9502BD5824B7F9470E6"
export SSHUSER=thomasv export SSHUSER=thomasv
RELEASEMANAGER=1 RELEASEMANAGER=1
elif [ "$GPGUSER" == "sombernight_releasekey" ]; then
PUBKEY="--local-user 0EEDCFD5CAFB459067349B23CA9EEEC43DF911DC"
export SSHUSER=sombernight
fi
if [ ! -z "$RELEASEMANAGER" ] ; then
echo -n "Code signing passphrase:" echo -n "Code signing passphrase:"
read -s password read -s password
export WIN_SIGNING_PASSWORD=$password export WIN_SIGNING_PASSWORD=$password
export P4A_RELEASE_KEYSTORE_PASSWD=$password export P4A_RELEASE_KEYSTORE_PASSWD=$password
export P4A_RELEASE_KEYALIAS_PASSWD=$password export P4A_RELEASE_KEYALIAS_PASSWD=$password
elif [ "$GPGUSER" == "sombernight_releasekey" ]; then # TODO add tests here to see if pw is correct
PUBKEY="--local-user 0EEDCFD5CAFB459067349B23CA9EEEC43DF911DC"
export SSHUSER=sombernight
fi fi