From b428c1fca506c1b516cb3c8abc8ab80c456336d7 Mon Sep 17 00:00:00 2001
From: Fredrik Fornwall <fredrik@fornwall.net>
Date: Tue, 14 Jul 2015 07:30:09 -0400
Subject: [PATCH] bash: Source etc/bash.bashrc also for interactive login
 shells

---
 packages/bash/build.sh    |  2 +-
 packages/bash/etc-profile | 19 +++++++++++++------
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/packages/bash/build.sh b/packages/bash/build.sh
index 0c79cd7e..34f0a809 100755
--- 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}
-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"
 
diff --git a/packages/bash/etc-profile b/packages/bash/etc-profile
index 6328df44..3adab248 100644
--- 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
-	done
-	unset i
+	fi
 fi
+
+for i in @TERMUX_PREFIX@/etc/profile.d/*.sh; do
+	if [ -r $i ]; then
+		. $i
+	fi
+done
+unset i
-- 
2.11.0