untabify create_ota.sh, mixed tabs/spaces is no fun

This commit is contained in:
Hans-Christoph Steiner 2018-02-23 21:43:03 +01:00
parent 1cd2e62505
commit 2d9cbc5455
1 changed files with 15 additions and 15 deletions

View File

@ -10,17 +10,17 @@ TMP_DIR=$(mktemp -d -t fdroidclient.tmp.XXXXXXXX)
trap "rm -rf $TMP_DIR" EXIT trap "rm -rf $TMP_DIR" EXIT
function error() { function error() {
echo "*** ERROR: " $@ echo "*** ERROR: " $@
usage usage
} }
function usage() { function usage() {
cat << EOFU cat << EOFU
Usage: $0 variant Usage: $0 variant
where: where:
- variant is one of: debug, release, or binary - variant is one of: debug, release, or binary
EOFU EOFU
exit 1 exit 1
} }
# Parse input # Parse input
@ -45,31 +45,31 @@ if [ $VARIANT == "binary" ] ; then
$GPG --verify $TMP_DIR/${FDROID_APK}.asc $GPG --verify $TMP_DIR/${FDROID_APK}.asc
rm $TMP_DIR/${FDROID_APK}.asc rm $TMP_DIR/${FDROID_APK}.asc
else else
cd $PROG_DIR cd $PROG_DIR
./gradlew assemble$(echo $VARIANT | tr 'dr' 'DR') ./gradlew assemble$(echo $VARIANT | tr 'dr' 'DR')
OUT_DIR=$PROG_DIR/app/build/outputs/apk OUT_DIR=$PROG_DIR/app/build/outputs/apk
if [ $VARIANT == "debug" ]; then if [ $VARIANT == "debug" ]; then
cp $OUT_DIR/app-${VARIANT}.apk \ cp $OUT_DIR/app-${VARIANT}.apk \
$TMP_DIR/$FDROID_APK $TMP_DIR/$FDROID_APK
elif [ -f $OUT_DIR/app-${VARIANT}-signed.apk ]; then elif [ -f $OUT_DIR/app-${VARIANT}-signed.apk ]; then
cp $OUT_DIR/app-${VARIANT}-signed.apk \ cp $OUT_DIR/app-${VARIANT}-signed.apk \
$TMP_DIR/$FDROID_APK $TMP_DIR/$FDROID_APK
else else
cp $OUT_DIR/app-${VARIANT}-unsigned.apk \ cp $OUT_DIR/app-${VARIANT}-unsigned.apk \
$TMP_DIR/$FDROID_APK $TMP_DIR/$FDROID_APK
fi fi
fi fi
# Make zip # Make zip
if [ $VARIANT == "binary" ] ; then if [ $VARIANT == "binary" ] ; then
ZIPBASE=F-DroidFromBinaries-${GITVERSION} ZIPBASE=F-DroidFromBinaries-${GITVERSION}
else else
ZIPBASE=F-Droid-${GITVERSION} ZIPBASE=F-Droid-${GITVERSION}
fi fi
if [ $VARIANT == "debug" ]; then if [ $VARIANT == "debug" ]; then
ZIP=${ZIPBASE}-debug.zip ZIP=${ZIPBASE}-debug.zip
else else
ZIP=${ZIPBASE}.zip ZIP=${ZIPBASE}.zip
fi fi
OUT_DIR=$PROG_DIR/app/build/distributions OUT_DIR=$PROG_DIR/app/build/distributions
mkdir -p $OUT_DIR mkdir -p $OUT_DIR