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
```

diff --git a/packages/proot/build.sh b/packages/proot/build.sh
index fc9ac406205300d6f22c0f19e241e11a44e32b2b..f7e7ee28f71afe6eaac6f016dd8768620f992b40 100644 (file)
--- 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 0e2c560a8337e0ed2680509d9197f006e8a087fd..9fde1a81780cc07682857f830dcdb0a9dc6fa748 100755 (executable)
--- 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