From 2f90522ad337a206e8e0a219b05b756f77c5b951 Mon Sep 17 00:00:00 2001
From: Oliver Schmidhauser <oli@glow.li>
Date: Wed, 16 Aug 2017 09:08:12 +0200
Subject: [PATCH] termux-chroot: Specify command to execute Allow a command to
 be specified when running termux-chroot. Example: ``` $ termux-chroot ls /
 bin  data  dev  etc  home  lib  proc  property_contexts  share  storage 
 system  tmp  usr  var  vendor ``` This makes it possible to run scripts that
 include a part that needs to be run in a chrooted environment, like a compile
 script. ``` ./configure make termux-chroot make install ```

Previously it had to be done like this:
```
./configure
make
termux-chroot
cd program
make install
exit
```
---
 packages/proot/build.sh      |  2 +-
 packages/proot/termux-chroot | 43 +++++++++++++++++++++++++++---------
 2 files changed, 34 insertions(+), 11 deletions(-)

diff --git a/packages/proot/build.sh b/packages/proot/build.sh
index fc9ac4062..f7e7ee28f 100644
--- a/packages/proot/build.sh
+++ b/packages/proot/build.sh
@@ -3,7 +3,7 @@ TERMUX_PKG_DESCRIPTION="Emulate chroot, bind mount and binfmt_misc for non-root
 # Just bump commit and version when needed:
 _COMMIT=ccf3d7ab4804c1d01dd4d8f970da033a872c3152
 TERMUX_PKG_VERSION=5.1.106
-TERMUX_PKG_REVISION=1
+TERMUX_PKG_REVISION=2
 TERMUX_PKG_SRCURL=https://github.com/termux/proot/archive/${_COMMIT}.zip
 TERMUX_PKG_SHA256=16c2a450dae0c321c2b949bab322ebcd8bff4d78ce989ef3024f2235d2b7fbbf
 TERMUX_PKG_FOLDERNAME=proot-$_COMMIT
diff --git a/packages/proot/termux-chroot b/packages/proot/termux-chroot
index 0e2c560a8..9fde1a817 100755
--- a/packages/proot/termux-chroot
+++ b/packages/proot/termux-chroot
@@ -1,12 +1,24 @@
 #!/bin/sh
 
-if [ $# != 0 ]; then
+SCRIPTNAME=termux-chroot
+show_usage () {
+	echo "Usage: $SCRIPTNAME [command]"
 	echo "termux-chroot: Setup a chroot to mimic a normal Linux file system"
 	echo ""
-	echo "Execute without arguments to run a chroot with traditional file system"
-	echo "hierarchy (having e.g. the folders /bin, /etc and /usr) within Termux."
-	exit
-fi
+	echo "Execute a command in a chroot with traditional file system hierarchy"
+	echo "(having e.g. the folders /bin, /etc and /usr) within Termux."
+	echo "If run without argument, the default shell will be executed"
+	exit 0
+}
+
+while getopts :h option
+do
+	case "$option" in
+		h) show_usage;;
+		?) echo "$SCRIPTNAME: illegal option -$OPTARG"; exit 1;
+	esac
+done
+shift $(($OPTIND-1))
 
 # For the /system/bin/linker(64) to be found:
 ARGS="-b /system:/system"
@@ -46,12 +58,23 @@ ARGS="$ARGS --cwd=/home"
 # Root of the file system:
 ARGS="$ARGS -r $PREFIX/.."
 
-# Program to execute:
+export HOME=/home
+
+# Shell to execute:
 PROGRAM=/bin/bash
 if [ -x $HOME/.termux/shell ]; then
 	PROGRAM=`readlink -f $HOME/.termux/shell`
 fi
-ARGS="$ARGS $PROGRAM -l"
-
-export HOME=/home
-$PREFIX/bin/proot $ARGS
+# Execute shell if no command has been supplied
+if [ -z "$1" ];then
+	ARGS="$ARGS $PROGRAM -l"
+	exec $PREFIX/bin/proot $ARGS
+else
+	# When a command is executed directly instead of opening a shell run
+	# the command in the current working directory instead of in /home
+	ARGS="$ARGS --cwd=."
+	# Start supplied command with "sh -c" so things like these work:
+	# termux-chroot "make;make install"
+	# termux-chroot "SOME_CONFIG=value ./configure"
+	exec $PREFIX/bin/proot $ARGS sh -c "$*"
+fi