Date: Sunday, March 18, 2012 @ 02:05:32 Author: eric Revision: 153696
upgpkg: bash 4.2.024-2 Update config file for new bash completions location Modified: bash/trunk/PKGBUILD bash/trunk/system.bashrc ---------------+ PKGBUILD | 26 +++++++++++++------------- system.bashrc | 2 +- 2 files changed, 14 insertions(+), 14 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2012-03-18 06:04:33 UTC (rev 153695) +++ PKGBUILD 2012-03-18 06:05:32 UTC (rev 153696) @@ -6,7 +6,7 @@ _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 @@ 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 @@ } 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 @@ '027d6bd8f5f6a06b75bb7698cb478089' '2902e0fee7a9168f3a4fd2ccd60ff047' '42f4400ed2314bd7519c020d0187edc5' - 'fe5d3a367f7d5f754214dc05e3d958ab' + '3546099a1b2f667adc9794f52e78e35b' '472f536d7c9e8250dc4568ec4cfaf294' '1100bc1dda2cdc06ac44d7e5d17864a3' 'a7184b76eb4a079f10174a0a8f574819' Modified: system.bashrc =================================================================== --- system.bashrc 2012-03-18 06:04:33 UTC (rev 153695) +++ system.bashrc 2012-03-18 06:05:32 UTC (rev 153696) @@ -20,4 +20,4 @@ ;; esac -[ -r /etc/bash_completion ] && . /etc/bash_completion +[ -r /usr/share/bash-completion/bash_completion ] && . /usr/share/bash-completion/bash_completion