[arch-commits] Commit in bash/trunk (PKGBUILD system.bashrc)

[Bartłomiej Piotrowski]

    Date: Saturday, March 22, 2014 @ 16:50:46
  Author: bpiotrowski
Revision: 208331

upgpkg: bash 4.3-3

explicitly escape the tilde in PROMPT_COMMAND (FS#39543)

Modified:
  bash/trunk/PKGBUILD
  bash/trunk/system.bashrc

---------------+
 PKGBUILD      |   51 +++++++++++++++++++++++----------------------------
 system.bashrc |    6 +++---
 2 files changed, 26 insertions(+), 31 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-03-22 14:26:01 UTC (rev 208330)
+++ PKGBUILD	2014-03-22 15:50:46 UTC (rev 208331)
@@ -1,5 +1,6 @@
 # $Id$
-# Maintainer: Allan McRae <allan at archlinux.org>
+# Maintainer:  Bartłomiej Piotrowski <bpiotrowski at archlinux.org>
+# Contributor: Allan McRae <allan at archlinux.org>
 # Contributor: Aaron Griffin <aaron at archlinux.org>
 
 pkgname=bash
@@ -6,11 +7,11 @@
 _basever=4.3
 _patchlevel=000 #prepare for some patches
 pkgver=$_basever #.$_patchlevel
-pkgrel=2
-pkgdesc="The GNU Bourne Again shell"
+pkgrel=3
+pkgdesc='The GNU Bourne Again shell'
 arch=('i686' 'x86_64')
 license=('GPL')
-url="http://www.gnu.org/software/bash/bash.html"
+url='http://www.gnu.org/software/bash/bash.html'
 groups=('base')
 backup=(etc/bash.bash{rc,_logout} etc/skel/.bash{rc,_profile,_logout})
 depends=('readline>=6.3' 'glibc')
@@ -24,7 +25,7 @@
         system.bash_logout
         bash-4.3-debug-trap.patch
         bash-4.3-test-nameref.patch)
-if [ $_patchlevel -gt 000 ]; then
+if [[ $_patchlevel -gt 000 ]]; then
     for (( p=1; p<=$((10#${_patchlevel})); p++ )); do
         source=(${source[@]} http://ftp.gnu.org/gnu/bash/bash-$_basever-patches/bash${_basever//./}-$(printf "%03d" $p){,.sig})
     done
@@ -31,20 +32,20 @@
 fi
 
 prepare() {
-  cd ${srcdir}/${pkgname}-$_basever
+  cd $pkgname-$_basever
 
   for (( p=1; p<=$((10#${_patchlevel})); p++ )); do
     msg "applying patch bash${_basever//./}-$(printf "%03d" $p)"
-    patch -p0 -i $srcdir/bash${_basever//./}-$(printf "%03d" $p)
+    patch -p0 -i ../bash${_basever//./}-$(printf "%03d" $p)
   done
-  
+
   # upstream patches I assume will be made official later...
-  patch -p0 -i $srcdir/bash-4.3-debug-trap.patch
-  patch -p0 -i $srcdir/bash-4.3-test-nameref.patch
+  patch -p0 -i ../bash-4.3-debug-trap.patch
+  patch -p0 -i ../bash-4.3-test-nameref.patch
 }
 
 build() {
-  cd ${srcdir}/${pkgname}-$_basever
+  cd $pkgname-$_basever
 
   _bashconfig=(-DDEFAULT_PATH_VALUE=\'\"/usr/local/sbin:/usr/local/bin:/usr/bin\"\'
                -DSTANDARD_UTILS_PATH=\'\"/usr/bin\"\'
@@ -58,26 +59,22 @@
 }
 
 check() {
-  cd ${srcdir}/${pkgname}-$_basever
-  make check
+  make -C $pkgname-$_basever check
 }
 
 package() {
-  cd ${srcdir}/${pkgname}-$_basever
-  make DESTDIR=${pkgdir} install
+  make -C $pkgname-$_basever DESTDIR="$pkgdir" install
+  ln -s bash "$pkgdir"/usr/bin/sh
 
-  ln -s bash ${pkgdir}/usr/bin/sh
+  install -dm755 "$pkgdir"/etc/skel/
+  # system-wide configuration files
+  install -m644 system.bashrc $pkgdir/etc/bash.bashrc
+  install -m644 system.bash_logout "$pkgdir"/etc/bash.bash_logout
 
-  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
-  
   # 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 dot.bashrc "$pkgdir"/etc/skel/.bashrc
+  install -m644 dot.bash_profile "$pkgdir"/etc/skel/.bash_profile
+  install -m644 dot.bash_logout "$pkgdir"/etc/skel/.bash_logout
 }
 
 md5sums=('81348932d5da294953e15d4814c74dd1'
@@ -85,9 +82,7 @@
          '027d6bd8f5f6a06b75bb7698cb478089'
          '2902e0fee7a9168f3a4fd2ccd60ff047'
          '42f4400ed2314bd7519c020d0187edc5'
-         '3546099a1b2f667adc9794f52e78e35b'
+         '561949793177116b7be29a07c385ba8b'
          '472f536d7c9e8250dc4568ec4cfaf294'
          '3d5b91bc498c43d7bf902b679c8168ef'
          '0615db31244215fd102ecbcd38b8b2e8')
-
-

Modified: system.bashrc
===================================================================
--- system.bashrc	2014-03-22 14:26:01 UTC (rev 208330)
+++ system.bashrc	2014-03-22 15:50:46 UTC (rev 208331)
@@ -12,11 +12,11 @@
 
 case ${TERM} in
   xterm*|rxvt*|Eterm|aterm|kterm|gnome*)
-    PROMPT_COMMAND=${PROMPT_COMMAND:+$PROMPT_COMMAND; }'printf "\033]0;%s@%s:%s\007" "${USER}" "${HOSTNAME%%.*}" "${PWD/#$HOME/~}"'
-                                                        
+    PROMPT_COMMAND=${PROMPT_COMMAND:+$PROMPT_COMMAND; }'printf "\033]0;%s@%s:%s\007" "${USER}" "${HOSTNAME%%.*}" "${PWD/#$HOME/\~}"'
+
     ;;
   screen)
-    PROMPT_COMMAND=${PROMPT_COMMAND:+$PROMPT_COMMAND; }'printf "\033_%s@%s:%s\033\\" "${USER}" "${HOSTNAME%%.*}" "${PWD/#$HOME/~}"'
+    PROMPT_COMMAND=${PROMPT_COMMAND:+$PROMPT_COMMAND; }'printf "\033_%s@%s:%s\033\\" "${USER}" "${HOSTNAME%%.*}" "${PWD/#$HOME/\~}"'
     ;;
 esac