diff --git a/packages/bash/build.sh b/packages/bash/build.sh index bd7c34f94..dcf78abff 100755 --- a/packages/bash/build.sh +++ b/packages/bash/build.sh @@ -3,7 +3,7 @@ TERMUX_PKG_DESCRIPTION="A sh-compatible shell that incorporates useful features TERMUX_PKG_DEPENDS="ncurses, readline, libandroid-support, termux-tools, command-not-found" _MAIN_VERSION=4.4 _PATCH_VERSION=5 -TERMUX_PKG_BUILD_REVISION=1 +TERMUX_PKG_BUILD_REVISION=2 TERMUX_PKG_VERSION=${_MAIN_VERSION}.${_PATCH_VERSION} TERMUX_PKG_SRCURL=https://mirrors.kernel.org/gnu/bash/bash-${_MAIN_VERSION}.tar.gz TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--enable-multibyte --without-bash-malloc --with-installed-readline ac_cv_header_grp_h=no ac_cv_rl_version=7.0" @@ -34,6 +34,12 @@ termux_step_pre_configure () { termux_step_post_make_install () { sed "s|@TERMUX_PREFIX@|$TERMUX_PREFIX|" $TERMUX_PKG_BUILDER_DIR/etc-profile > $TERMUX_PREFIX/etc/profile + sed "s|@TERMUX_PREFIX@|$TERMUX_PREFIX|" \ + $TERMUX_PKG_BUILDER_DIR/etc-profile | \ + sed "s|@TERMUX_HOME@|$TERMUX_ANDROID_HOME|" > \ + $TERMUX_PREFIX/etc/profile # /etc/bash.bashrc - System-wide .bashrc file for interactive shells. (config-top.h in bash source, patched to enable): - sed "s|@TERMUX_PREFIX@|$TERMUX_PREFIX|" $TERMUX_PKG_BUILDER_DIR/etc-bash.bashrc > $TERMUX_PREFIX/etc/bash.bashrc + sed "s|@TERMUX_PREFIX@|$TERMUX_PREFIX|" \ + $TERMUX_PKG_BUILDER_DIR/etc-bash.bashrc > \ + $TERMUX_PREFIX/etc/bash.bashrc } diff --git a/packages/bash/etc-profile b/packages/bash/etc-profile index 3adab2489..962766d50 100644 --- a/packages/bash/etc-profile +++ b/packages/bash/etc-profile @@ -1,15 +1,18 @@ -# Source etc/bash.bashrc also for interactive bash login shells: -if [ "$BASH" ]; then - if [[ "$-" == *"i"* ]]; then - if [ -r @TERMUX_PREFIX@/etc/bash.bashrc ]; then - . @TERMUX_PREFIX@/etc/bash.bashrc - fi - fi -fi - for i in @TERMUX_PREFIX@/etc/profile.d/*.sh; do if [ -r $i ]; then . $i fi done unset i + +# Source etc/bash.bashrc and ~/.bashrc also for interactive bash login shells: +if [ "$BASH" ]; then + if [[ "$-" == *"i"* ]]; then + if [ -r /data/data/com.termux/files/usr/etc/bash.bashrc ]; then + . /data/data/com.termux/files/usr/etc/bash.bashrc + fi + if [ -r /data/data/com.termux/files/home/.bashrc ]; then + . /data/data/com.termux/files/home/.bashrc + fi + fi +fi