From 1e3e1c574dcff85d261a571c70aba823f4b064a3 Mon Sep 17 00:00:00 2001
From: mittorn <mittorn@sibmail.com>
Date: Thu, 11 Aug 2016 20:18:08 +0000
Subject: [PATCH] Update build script

---
 build-test.sh | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/build-test.sh b/build-test.sh
index c9a4e755..29b15e48 100644
--- a/build-test.sh
+++ b/build-test.sh
@@ -3,14 +3,23 @@ AAPT=./../aapt
 DX=./../dx
 APKBUILDER=./../apkbuilder
 mkdir gen
-mkdir bin
+mkdir -p bin/classes
+
+JAVAC=$JAVA_HOME/bin/javac
+
+if [ -z "$JAVA_HOME" ]; then
+    export JAVAC=$(which javac)
+fi
+
+: ${OUTPUT:=$1}
+: ${OUTPUT:=bin/xash3d-signed.apk}
 sh gen-version.sh test build
 rm assets/extras.pak
 python2.7 makepak.py xash-extras assets/extras.pak
 $AAPT package -m -J gen/ --rename-manifest-package in.celest.xash3d.hl -M AndroidManifest.xml -S test/res -I $ANDROID_JAR
-$JAVA_HOME/bin/javac -d bin/classes -s bin/classes -cp $ANDROID_JAR gen/in/celest/xash3d/hl/R.java src/in/celest/xash3d/*.java
+$JAVAC -d bin/classes -s bin/classes -cp $ANDROID_JAR gen/in/celest/xash3d/hl/R.java src/in/celest/xash3d/*.java
 $DX --dex --output=bin/classes.dex bin/classes/
-/mnt/app/apktool/aapt package -f -M test/AndroidManifest.xml -S test/res -I $ANDROID_JAR -F bin/xash3d.apk.unaligned
+$AAPT package -f -M test/AndroidManifest.xml -S test/res -I $ANDROID_JAR -F bin/xash3d.apk.unaligned
 zip bin/xash3d.apk.unaligned assets/*
 $APKBUILDER bin/xash3d.apk -u -nf libs/ -rj libs -f bin/classes.dex -z bin/xash3d.apk.unaligned
-java -jar /mnt/app/apktool/signapk.jar /mnt/app/apktool/testkey.x509.pem /mnt/app/apktool/testkey.pk8 bin/xash3d.apk bin/xash3d-signed.apk
+java -jar /mnt/app/apktool/signapk.jar /mnt/app/apktool/testkey.x509.pem /mnt/app/apktool/testkey.pk8 bin/xash3d.apk $OUTPUT