X-Git-Url: https://git.distorted.org.uk/~mdw/termux-packages/blobdiff_plain/59f0d218a6ff34c80cf898f6d7ac62555ba8eb11..0dc712fa46d5e72450b46c8652df87790246ff03:/build-all.sh

diff --git a/build-all.sh b/build-all.sh
index 26136918..c0bff918 100755
--- a/build-all.sh
+++ b/build-all.sh
@@ -3,24 +3,47 @@
 
 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
+BUILDORDER_FILE=$TERMUX_TOPDIR/_buildall/buildorder.txt
+BUILDSTATUS_FILE=$TERMUX_TOPDIR/_buildall/buildstatus.txt
 
 if [ -e $BUILDORDER_FILE ]; then
-	echo "Continuing with existing buildorder file: $BUILDORDER_FILE"
+	echo "Using existing buildorder file: $BUILDORDER_FILE"
 else
-	rm -Rf $HOME/termux /data/data $HOME/termux/_buildall
-	mkdir -p $HOME/termux/_buildall
-	./buildorder.py packages > $BUILDORDER_FILE
+	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 >> $HOME/termux/_buildall/ALL.out 2>> $HOME/termux/_buildall/ALL.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
-	echo -n "Building $package... " >> $HOME/termux/_buildall/ALL.out
+	# Check build status (grepping is a bit crude, but it works)
+	if [ -e $BUILDSTATUS_FILE ] && \
+			grep "^$package\$" $BUILDSTATUS_FILE >/dev/null; then
+		echo "Skipping $package"
+		continue
+	fi
+
+	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"
+
+	# Update build status
+	echo "$package" >> $BUILDSTATUS_FILE
 done
+
+# Update build status
+rm -f $BUILDSTATUS_FILE
+echo "Finished"