Tweak build script and docker setup

[termux-packages] / build-all.sh

diff --git a/build-all.sh b/build-all.sh
index f6c1e9a..c0bff91 100755 (executable)
--- a/build-all.sh
+++ b/build-all.sh
@@ -3,24 +3,27 @@
 
 set -e -u -o pipefail
 
+# Read settings from .termuxrc if existing
+test -f $HOME/.termuxrc && . $HOME/.termuxrc
+: ${TERMUX_TOPDIR:="$HOME/.termux-build"}
+
 BUILDSCRIPT=`dirname $0`/build-package.sh
-BUILDORDER_FILE=$HOME/termux/_buildall/buildorder.txt
-BUILDSTATUS_FILE=$HOME/termux/_buildall/buildstatus.txt
+BUILDORDER_FILE=$TERMUX_TOPDIR/_buildall/buildorder.txt
+BUILDSTATUS_FILE=$TERMUX_TOPDIR/_buildall/buildstatus.txt
 
 if [ -e $BUILDORDER_FILE ]; then
        echo "Using existing buildorder file: $BUILDORDER_FILE"
 else
-       rm -Rf $HOME/termux/* /data/data $HOME/termux/_buildall
-       mkdir -p $HOME/termux/_buildall
+       mkdir -p $TERMUX_TOPDIR/_buildall
        ./scripts/buildorder.py > $BUILDORDER_FILE
 fi
 if [ -e $BUILDSTATUS_FILE ]; then
        echo "Continuing build-all from: $BUILDSTATUS_FILE"
 fi
 
-exec >  >(tee -a $HOME/termux/_buildall/ALL.out)
-exec 2> >(tee -a $HOME/termux/_buildall/ALL.err >&2)
-trap 'echo failure; echo See: $HOME/termux/_buildall/${package}.err' ERR
+exec >  >(tee -a $TERMUX_TOPDIR/_buildall/ALL.out)
+exec 2> >(tee -a $TERMUX_TOPDIR/_buildall/ALL.err >&2)
+trap 'echo failure; echo See: $TERMUX_TOPDIR/_buildall/${package}.err' ERR
 
 for package in `cat $BUILDORDER_FILE`; do
        # Check build status (grepping is a bit crude, but it works)
@@ -32,7 +35,7 @@ for package in `cat $BUILDORDER_FILE`; do
 
        echo -n "Building $package... "
        BUILD_START=`date "+%s"`
-       bash -x $BUILDSCRIPT $package > $HOME/termux/_buildall/${package}.out 2> $HOME/termux/_buildall/${package}.err
+       bash -x $BUILDSCRIPT $package > $TERMUX_TOPDIR/_buildall/${package}.out 2> $TERMUX_TOPDIR/_buildall/${package}.err
        BUILD_END=`date "+%s"`
        BUILD_SECONDS=$(( $BUILD_END - $BUILD_START ))
        echo "done in $BUILD_SECONDS"