bash: Source etc/bash.bashrc also for interactive login shells

diff --git a/packages/bash/build.sh b/packages/bash/build.sh
index 0c79cd7e71a0bdfdc47ca11d3ddaa8953c982987..34f0a809aaca3868c04c4d892e03d5f78cde5493 100755 (executable)
--- a/packages/bash/build.sh
+++ b/packages/bash/build.sh
@@ -4,7 +4,7 @@ TERMUX_PKG_DEPENDS="ncurses, readline, libandroid-support, termux-tools, command
 _MAIN_VERSION=4.3
 _PATCH_VERSION=39
 TERMUX_PKG_VERSION=${_MAIN_VERSION}.${_PATCH_VERSION}
 _MAIN_VERSION=4.3
 _PATCH_VERSION=39
 TERMUX_PKG_VERSION=${_MAIN_VERSION}.${_PATCH_VERSION}

-TERMUX_PKG_BUILD_REVISION=4
+TERMUX_PKG_BUILD_REVISION=5

 TERMUX_PKG_SRCURL=http://ftp.gnu.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_header_pwd_h=no ac_cv_rl_version=6.3"
 
 TERMUX_PKG_SRCURL=http://ftp.gnu.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_header_pwd_h=no ac_cv_rl_version=6.3"
 

diff --git a/packages/bash/etc-profile b/packages/bash/etc-profile
index 6328df4437cfb3ec721b05037046ac42194314ae..3adab2489cb32f37683fc12f9794405751eb1034 100644 (file)
--- a/packages/bash/etc-profile
+++ b/packages/bash/etc-profile
@@ -1,8 +1,15 @@
-if [ -d @TERMUX_PREFIX@/etc/profile.d ]; then
-       for i in @TERMUX_PREFIX@/etc/profile.d/*.sh; do
-               if [ -r $i ]; then
-                       . $i
+# 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

-       done
-       unset i
+       fi

 fi
 fi

+
+for i in @TERMUX_PREFIX@/etc/profile.d/*.sh; do
+       if [ -r $i ]; then
+               . $i
+       fi
+done
+unset i