summaryrefslogtreecommitdiff
path: root/testing/bash
diff options
context:
space:
mode:
Diffstat (limited to 'testing/bash')
-rw-r--r--testing/bash/PKGBUILD28
-rw-r--r--testing/bash/system.bashrc2
2 files changed, 15 insertions, 15 deletions
diff --git a/testing/bash/PKGBUILD b/testing/bash/PKGBUILD
index c12cd512c..6a0ae5ae2 100644
--- a/testing/bash/PKGBUILD
+++ b/testing/bash/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 153410 2012-03-13 01:18:55Z allan $
+# $Id: PKGBUILD 153697 2012-03-18 06:05:58Z eric $
# Maintainer: Allan McRae <allan@archlinux.org>
# Contributor: Aaron Griffin <aaron@archlinux.org>
@@ -6,7 +6,7 @@ pkgname=bash
_basever=4.2
_patchlevel=024 #prepare for some patches
pkgver=$_basever.$_patchlevel
-pkgrel=1
+pkgrel=2
pkgdesc="The GNU Bourne Again shell"
arch=('i686' 'x86_64')
license=('GPL')
@@ -29,7 +29,7 @@ if [ $_patchlevel -gt 000 ]; then
fi
build() {
- cd ${srcdir}/${pkgname}-$_basever
+ cd "${srcdir}"/${pkgname}-$_basever
for (( p=1; p<=$((10#${_patchlevel})); p++ )); do
msg "applying patch bash${_basever//./}-$(printf "%03d" $p)"
patch -Np0 -i $srcdir/bash${_basever//./}-$(printf "%03d" $p)
@@ -48,28 +48,28 @@ build() {
}
check() {
- cd ${srcdir}/${pkgname}-$_basever
+ cd "${srcdir}"/${pkgname}-$_basever
make check
}
package() {
- cd ${srcdir}/${pkgname}-$_basever
- make DESTDIR=${pkgdir} install
+ cd "${srcdir}"/${pkgname}-$_basever
+ make DESTDIR="${pkgdir}" install
# for now, bash is our default /bin/sh
- cd ${pkgdir}/bin
+ cd "${pkgdir}"/bin
ln -s bash sh
- install -dm755 ${pkgdir}/etc/skel/
+ install -dm755 "${pkgdir}"/etc/skel/
# system-wide configuration files
- install -m644 ${srcdir}/system.bashrc ${pkgdir}/etc/bash.bashrc
- install -m644 ${srcdir}/system.bash_logout ${pkgdir}/etc/bash.bash_logout
+ install -m644 "${srcdir}"/system.bashrc "${pkgdir}"/etc/bash.bashrc
+ install -m644 "${srcdir}"/system.bash_logout "${pkgdir}"/etc/bash.bash_logout
# user configuration file skeletons
- install -m644 ${srcdir}/dot.bashrc ${pkgdir}/etc/skel/.bashrc
- install -m644 ${srcdir}/dot.bash_profile ${pkgdir}/etc/skel/.bash_profile
- install -m644 ${srcdir}/dot.bash_logout ${pkgdir}/etc/skel/.bash_logout
+ install -m644 "${srcdir}"/dot.bashrc "${pkgdir}"/etc/skel/.bashrc
+ install -m644 "${srcdir}"/dot.bash_profile "${pkgdir}"/etc/skel/.bash_profile
+ install -m644 "${srcdir}"/dot.bash_logout "${pkgdir}"/etc/skel/.bash_logout
}
md5sums=('3fb927c7c33022f1c327f14a81c0d4b0'
@@ -77,7 +77,7 @@ md5sums=('3fb927c7c33022f1c327f14a81c0d4b0'
'027d6bd8f5f6a06b75bb7698cb478089'
'2902e0fee7a9168f3a4fd2ccd60ff047'
'42f4400ed2314bd7519c020d0187edc5'
- 'fe5d3a367f7d5f754214dc05e3d958ab'
+ '3546099a1b2f667adc9794f52e78e35b'
'472f536d7c9e8250dc4568ec4cfaf294'
'1100bc1dda2cdc06ac44d7e5d17864a3'
'a7184b76eb4a079f10174a0a8f574819'
diff --git a/testing/bash/system.bashrc b/testing/bash/system.bashrc
index 84de2898c..a2231e861 100644
--- a/testing/bash/system.bashrc
+++ b/testing/bash/system.bashrc
@@ -20,4 +20,4 @@ case ${TERM} in
;;
esac
-[ -r /etc/bash_completion ] && . /etc/bash_completion
+[ -r /usr/share/bash-completion/bash_completion ] && . /usr/share/bash-completion/bash_completion