~mdw
/
termux-packages
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update tty-clock to version 2.3 (#680)
[termux-packages]
/
packages
/
bash
/
build.sh
diff --git
a/packages/bash/build.sh
b/packages/bash/build.sh
index
bd7c34f
..
31d7fe2
100755
(executable)
--- 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_DEPENDS="ncurses, readline, libandroid-support, termux-tools, command-not-found"
_MAIN_VERSION=4.4
_PATCH_VERSION=5
-TERMUX_PKG_
BUILD_REVISION=1
+TERMUX_PKG_
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"
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
+27,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
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
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):
# /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
}
}