create_ota: fix building APK for OTA update ZIP
There were a couple problems here:
* PROG_DIR instead of $PROG_DIR
* ./gradlew must be called in the project dir
diff --git a/create_ota.sh b/create_ota.sh
index f99a3e3..b2c5059 100755
--- a/create_ota.sh
+++ b/create_ota.sh
@@ -46,14 +46,19 @@
cp app/src/main/scripts/80-fdroid.sh $TMP_DIR/
if [ -z $BINARIES ] ; then
- $PROG_DIR/gradlew assemble$(echo $VARIANT | tr 'dr' 'DR')
- if [ $VARIANT == "debug" ]; then
- cp $PROG_DIR/app/build/outputs/apk/FDroidPrivilegedExtension-${VARIANT}.apk $TMP_DIR/FDroidPrivilegedExtension.apk
- elif [ -f PROG_DIR/app/build/outputs/apk/FDroidPrivilegedExtension-${VARIANT}-signed.apk ]; then
- cp PROG_DIR/app/build/outputs/apk/FDroidPrivilegedExtension-${VARIANT}-signed.apk $TMP_DIR/FDroidPrivilegedExtension.apk
- else
- cp PROG_DIR/app/build/outputs/apk/FDroidPrivilegedExtension-${VARIANT}-unsigned.apk $TMP_DIR/FDroidPrivilegedExtension.apk
- fi
+ cd $PROG_DIR
+ ./gradlew assemble$(echo $VARIANT | tr 'dr' 'DR')
+ OUT_DIR=$PROG_DIR/app/build/outputs/apk
+ if [ $VARIANT == "debug" ]; then
+ cp $OUT_DIR/FDroidPrivilegedExtension-${VARIANT}.apk \
+ $TMP_DIR/FDroidPrivilegedExtension.apk
+ elif [ -f $OUT_DIR/FDroidPrivilegedExtension-${VARIANT}-signed.apk ]; then
+ cp $OUT_DIR/FDroidPrivilegedExtension-${VARIANT}-signed.apk \
+ $TMP_DIR/FDroidPrivilegedExtension.apk
+ else
+ cp $OUT_DIR/FDroidPrivilegedExtension-${VARIANT}-unsigned.apk \
+ $TMP_DIR/FDroidPrivilegedExtension.apk
+ fi
else
[ ! -f $TMP_DIR/$PRIVEXT_APK ] && curl -L https://f-droid.org/repo/$PRIVEXT_APK > $TMP_DIR/$PRIVEXT_APK
[ ! -f $TMP_DIR/${PRIVEXT_APK}.asc ] && curl -L https://f-droid.org/repo/${PRIVEXT_APK}.asc > $TMP_DIR/${PRIVEXT_APK}.asc