X-Git-Url: https://git.distorted.org.uk/~mdw/termux-packages/blobdiff_plain/4643d4be2cdcd1448d08ac0408a813b3b66836d7..86779dda6a14a08e871f34ce599350d21b9d6064:/packages/bash/build.sh

diff --git a/packages/bash/build.sh b/packages/bash/build.sh
index bd7c34f9..89a11efa 100755
--- a/packages/bash/build.sh
+++ b/packages/bash/build.sh
@@ -2,8 +2,7 @@ TERMUX_PKG_HOMEPAGE=https://www.gnu.org/software/bash/
 TERMUX_PKG_DESCRIPTION="A sh-compatible shell that incorporates useful features from the Korn shell (ksh) and C shell (csh)"
 TERMUX_PKG_DEPENDS="ncurses, readline, libandroid-support, termux-tools, command-not-found"
 _MAIN_VERSION=4.4
-_PATCH_VERSION=5
-TERMUX_PKG_BUILD_REVISION=1
+_PATCH_VERSION=12
 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"
@@ -27,13 +26,21 @@ termux_step_pre_configure () {
         cd $TERMUX_PKG_SRCDIR
 	for patch_number in `seq -f '%03g' ${_PATCH_VERSION}`; do
 		PATCHFILE=$TERMUX_PKG_CACHEDIR/bash_patch_${patch_number}.patch
-		test ! -f $PATCHFILE && curl "https://mirrors.kernel.org/gnu/bash/bash-4.4-patches/bash44-$patch_number" > $PATCHFILE
+		test ! -f $PATCHFILE && termux_download \
+			"https://mirrors.kernel.org/gnu/bash/bash-4.4-patches/bash44-$patch_number" \
+			$PATCHFILE
 		patch -p0 -i $PATCHFILE
 	done
 }
 
 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
 }