From 47a48656bce6e1a1a084e3c8cb83bd82a2857acf Mon Sep 17 00:00:00 2001
From: Martin Bruse <zondolfin@gmail.com>
Date: Thu, 5 Mar 2020 14:59:54 +0100
Subject: [PATCH] More GitHub actions work.

---
 .github/workflows/android.yml | 6 +++---
 tools/download_keystore.sh    | 6 +++++-
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
index ec5db60..87172df 100644
--- a/.github/workflows/android.yml
+++ b/.github/workflows/android.yml
@@ -1,4 +1,4 @@
-name: Android CI
+name: Build release
 
 on:
   push:
@@ -13,7 +13,7 @@ jobs:
 
     steps:
     - uses: actions/checkout@v2
-    - name: set up JDK 1.8
+    - name: Set up JDK 1.8
       uses: actions/setup-java@v1
       with:
         java-version: 1.8
@@ -23,7 +23,7 @@ jobs:
       run: ./tools/download_keystore.sh
     - name: Build with Gradle
       env:
-        KEYSTORE: ${GITHUB_WORKSPACE}/android-diplicity/signing.keystore
+        KEYSTORE: $GITHUB_WORKSPACE/android-diplicity/signing.keystore
         KEYSTORE_PASSWORD: ${{ secrets.keystorePassword }}
       run: ./gradlew assembleRelease
 
diff --git a/tools/download_keystore.sh b/tools/download_keystore.sh
index fbb1f74..b8600d4 100755
--- a/tools/download_keystore.sh
+++ b/tools/download_keystore.sh
@@ -2,6 +2,10 @@
 
 KEYSTORE="${GITHUB_WORKSPACE}/android-diplicity/signing.keystore"
 
+if [ $KEYSTORE_URL == "" ]; then
+	echo "no keystore url set?"
+fi
+
 # use curl to download a keystore from $KEYSTORE_URI, if set,
 # to the path/filename set in $KEYSTORE.
 if [ "${KEYSTORE}" != "" ] && [ "${KEYSTORE_URI}" != "" ]; then
@@ -10,5 +14,5 @@ if [ "${KEYSTORE}" != "" ] && [ "${KEYSTORE_URI}" != "" ]; then
     # expose the sensitive uri in the build logs:
     curl -L -o ${KEYSTORE} ${KEYSTORE_URI}
 else
-    echo "Keystore uri not set.  .APK artifact will not be signed."
+    echo "Keystore uri not set. APK artifact will not be signed."
 fi