From 1667d0a8c956ca0ab6e0211b47dd53fe2f66db42 Mon Sep 17 00:00:00 2001
From: Hans-Christoph Steiner <hans@eds.org>
Date: Fri, 23 Feb 2018 21:43:03 +0100
Subject: [PATCH] untabify create_ota.sh, mixed tabs/spaces is no fun
---
create_ota.sh | 30 +++++++++++++++---------------
1 file changed, 15 insertions(+), 15 deletions(-)
diff --git a/create_ota.sh b/create_ota.sh
index e07a2275f..6023d1731 100755
--- a/create_ota.sh
+++ b/create_ota.sh
@@ -10,17 +10,17 @@ TMP_DIR=$(mktemp -d -t fdroidclient.tmp.XXXXXXXX)
trap "rm -rf $TMP_DIR" EXIT
function error() {
- echo "*** ERROR: " $@
- usage
+ echo "*** ERROR: " $@
+ usage
}
function usage() {
- cat << EOFU
+ cat << EOFU
Usage: $0 variant
where:
- variant is one of: debug, release, or binary
EOFU
- exit 1
+ exit 1
}
# Parse input
@@ -45,31 +45,31 @@ if [ $VARIANT == "binary" ] ; then
$GPG --verify $TMP_DIR/${FDROID_APK}.asc
rm $TMP_DIR/${FDROID_APK}.asc
else
- cd $PROG_DIR
+ 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/app-${VARIANT}.apk \
- $TMP_DIR/$FDROID_APK
+ cp $OUT_DIR/app-${VARIANT}.apk \
+ $TMP_DIR/$FDROID_APK
elif [ -f $OUT_DIR/app-${VARIANT}-signed.apk ]; then
- cp $OUT_DIR/app-${VARIANT}-signed.apk \
- $TMP_DIR/$FDROID_APK
+ cp $OUT_DIR/app-${VARIANT}-signed.apk \
+ $TMP_DIR/$FDROID_APK
else
- cp $OUT_DIR/app-${VARIANT}-unsigned.apk \
- $TMP_DIR/$FDROID_APK
+ cp $OUT_DIR/app-${VARIANT}-unsigned.apk \
+ $TMP_DIR/$FDROID_APK
fi
fi
# Make zip
if [ $VARIANT == "binary" ] ; then
- ZIPBASE=F-DroidFromBinaries-${GITVERSION}
+ ZIPBASE=F-DroidFromBinaries-${GITVERSION}
else
- ZIPBASE=F-Droid-${GITVERSION}
+ ZIPBASE=F-Droid-${GITVERSION}
fi
if [ $VARIANT == "debug" ]; then
- ZIP=${ZIPBASE}-debug.zip
+ ZIP=${ZIPBASE}-debug.zip
else
- ZIP=${ZIPBASE}.zip
+ ZIP=${ZIPBASE}.zip
fi
OUT_DIR=$PROG_DIR/app/build/distributions
mkdir -p $OUT_DIR