diff --git a/configure.ac b/configure.ac index 6559647..bc20ae8 100644 --- a/configure.ac +++ b/configure.ac @@ -22,7 +22,7 @@ dnl along with termux-tools. If not, see dnl . AC_PREREQ([2.69]) -AC_INIT([termux-tools], [1.44.7], [support@termux.dev]) +AC_INIT([termux-tools], [1.45.0], [support@termux.dev]) AM_INIT_AUTOMAKE([foreign]) diff --git a/scripts/login.in b/scripts/login.in index 393322e..2e7aa79 100644 --- a/scripts/login.in +++ b/scripts/login.in @@ -39,8 +39,17 @@ if [ -z "${TERMUX_APP_PACKAGE_MANAGER-}" ]; then fi fi -if [ -f @TERMUX_PREFIX@/lib/libtermux-exec.so ]; then - export LD_PRELOAD=@TERMUX_PREFIX@/lib/libtermux-exec.so +# Export `libtermux-exec-ld-preload.so` for `termux-exec` +# package version `>= 2.0.0`. +# Some devices may not support setting `$LD_PRELOAD`. +# - https://github.com/termux/termux-packages/issues/2066 +# - https://github.com/termux/termux-packages/commit/1ec6c042 +# - https://github.com/termux/termux-packages/commit/6fb2bb2f +if [ -f "@TERMUX_PREFIX@/lib/libtermux-exec-ld-preload.so" ]; then + export LD_PRELOAD="@TERMUX_PREFIX@/lib/libtermux-exec-ld-preload.so" + $SHELL -c "coreutils --coreutils-prog=true" > /dev/null 2>&1 || unset LD_PRELOAD +elif [ -f "@TERMUX_PREFIX@/lib/libtermux-exec.so" ]; then + export LD_PRELOAD="@TERMUX_PREFIX@/lib/libtermux-exec.so" $SHELL -c "coreutils --coreutils-prog=true" > /dev/null 2>&1 || unset LD_PRELOAD fi diff --git a/scripts/termux-info.in b/scripts/termux-info.in index f932ed1..f7ec782 100644 --- a/scripts/termux-info.in +++ b/scripts/termux-info.in @@ -3,7 +3,7 @@ NO_SET_CLIPBOARD=0 show_usage () { - echo 'usage: termux-info' + echo 'usage: termux-info [--no-set-clipboard]' echo 'Provides information about Termux, and the current system. Helpful for debugging.' exit 0 @@ -132,6 +132,10 @@ Device manufacturer: $(getprop ro.product.manufacturer) Device model: $(getprop ro.product.model) +Supported ABIs: +SUPPORTED_ABIS: $(getprop ro.product.cpu.abilist) +SUPPORTED_32_BIT_ABIS: $(getprop ro.product.cpu.abilist32) +SUPPORTED_64_BIT_ABIS: $(getprop ro.product.cpu.abilist64) LD Variables: LD_LIBRARY_PATH=$LD_LIBRARY_PATH LD_PRELOAD=$LD_PRELOAD"