AaronFiore/electrum
1
0
Fork 0
Code Activity

android: pass keystore password as argument to make_apk.

Browse Source 
export does not work because it runs in a container.

also, check password using keytool
This commit is contained in:
ThomasV
2022-09-27 20:12:02 +02:00
parent b5900eae98
commit dc78ba3c04
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
contrib/android/make_apk.sh
View File

@@ -53,6 +53,8 @@ fi
if [[ "$3" == "release" ]] ; then if [[ "$3" == "release" ]] ; then
# do release build, and sign the APKs. # do release build, and sign the APKs.
TARGET="release" TARGET="release"
export P4A_RELEASE_KEYSTORE_PASSWD="$4"
export P4A_RELEASE_KEYALIAS_PASSWD="$4"
export P4A_RELEASE_KEYSTORE=~/.keystore export P4A_RELEASE_KEYSTORE=~/.keystore
export P4A_RELEASE_KEYALIAS=electrum export P4A_RELEASE_KEYALIAS=electrum
if [ -z "$P4A_RELEASE_KEYSTORE_PASSWD" ] || [ -z "$P4A_RELEASE_KEYALIAS_PASSWD" ]; then if [ -z "$P4A_RELEASE_KEYSTORE_PASSWD" ] || [ -z "$P4A_RELEASE_KEYALIAS_PASSWD" ]; then

8
contrib/release.sh
View File

@@ -66,10 +66,10 @@ fi
if [ ! -z "$RELEASEMANAGER" ] ; then if [ ! -z "$RELEASEMANAGER" ] ; then
echo -n "Code signing passphrase:" echo -n "Code signing passphrase:"
read -s password read -s password
# tests password against keystore
keytool -list -storepass $password
# the same password is used for windows signing
export WIN_SIGNING_PASSWORD=$password export WIN_SIGNING_PASSWORD=$password
export P4A_RELEASE_KEYSTORE_PASSWD=$password
export P4A_RELEASE_KEYALIAS_PASSWD=$password
# TODO add tests here to see if pw is correct
fi fi
@@ -147,7 +147,7 @@ if test -f "dist/$apk1"; then
info "file exists: $apk1" info "file exists: $apk1"
else else
if [ ! -z "$RELEASEMANAGER" ] ; then if [ ! -z "$RELEASEMANAGER" ] ; then
./contrib/android/build.sh kivy all release ./contrib/android/build.sh kivy all release $password
else else
./contrib/android/build.sh kivy all release-unsigned ./contrib/android/build.sh kivy all release-unsigned
mv "dist/$apk1_unsigned" "dist/$apk1" mv "dist/$apk1_unsigned" "dist/$apk1"