[arch-commits] Commit in bash/trunk (PKGBUILD system.bashrc)
Date: Wednesday, December 28, 2016 @ 18:53:03
Author: bpiotrowski
Revision: 284949
Extend regex to match screen-256color
Modified:
bash/trunk/PKGBUILD
bash/trunk/system.bashrc
---+
PKGBUILD |2 +-
system.bashrc |2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2016-12-28 18:19:05 UTC (rev 284948)
+++ PKGBUILD2016-12-28 18:53:03 UTC (rev 284949)
@@ -78,7 +78,7 @@
'027d6bd8f5f6a06b75bb7698cb478089'
'2902e0fee7a9168f3a4fd2ccd60ff047'
'42f4400ed2314bd7519c020d0187edc5'
- 'f4a54b6a69acb33f2c795f6042d663f8'
+ 'd8f3f334e72c0e30032eae1a1229aef1'
'472f536d7c9e8250dc4568ec4cfaf294'
'817d01a6c0af6f79308a8b7b649e53d8'
'SKIP'
Modified: system.bashrc
===
--- system.bashrc 2016-12-28 18:19:05 UTC (rev 284948)
+++ system.bashrc 2016-12-28 18:53:03 UTC (rev 284949)
@@ -14,7 +14,7 @@
PROMPT_COMMAND=${PROMPT_COMMAND:+$PROMPT_COMMAND; }'printf
"\033]0;%s@%s:%s\007" "${USER}" "${HOSTNAME%%.*}" "${PWD/#$HOME/\~}"'
;;
- screen)
+ screen*)
PROMPT_COMMAND=${PROMPT_COMMAND:+$PROMPT_COMMAND; }'printf
"\033_%s@%s:%s\033\\" "${USER}" "${HOSTNAME%%.*}" "${PWD/#$HOME/\~}"'
;;
esac
[arch-commits] Commit in bash/trunk (PKGBUILD system.bashrc)
Date: Saturday, December 10, 2016 @ 19:04:23
Author: bpiotrowski
Revision: 283016
upgpkg: bash 4.4.005-2
enable checkwinsize for graphical sessions (fixes FS#32821)
Modified:
bash/trunk/PKGBUILD
bash/trunk/system.bashrc
---+
PKGBUILD |4 ++--
system.bashrc |2 ++
2 files changed, 4 insertions(+), 2 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2016-12-10 18:48:18 UTC (rev 283015)
+++ PKGBUILD2016-12-10 19:04:23 UTC (rev 283016)
@@ -7,7 +7,7 @@
_basever=4.4
_patchlevel=005
pkgver=${_basever}.${_patchlevel}
-pkgrel=1
+pkgrel=2
pkgdesc='The GNU Bourne Again shell'
arch=('i686' 'x86_64')
license=('GPL')
@@ -78,7 +78,7 @@
'027d6bd8f5f6a06b75bb7698cb478089'
'2902e0fee7a9168f3a4fd2ccd60ff047'
'42f4400ed2314bd7519c020d0187edc5'
- '09c6f7f099f18e01cc2250719757c9a2'
+ 'f4a54b6a69acb33f2c795f6042d663f8'
'472f536d7c9e8250dc4568ec4cfaf294'
'817d01a6c0af6f79308a8b7b649e53d8'
'SKIP'
Modified: system.bashrc
===
--- system.bashrc 2016-12-10 18:48:18 UTC (rev 283015)
+++ system.bashrc 2016-12-10 19:04:23 UTC (rev 283016)
@@ -5,6 +5,8 @@
# If not running interactively, don't do anything
[[ $- != *i* ]] && return
+[[ $DISPLAY ]] && shopt -s checkwinsize
+
PS1='[\u@\h \W]\$ '
case ${TERM} in
[arch-commits] Commit in bash/trunk (PKGBUILD system.bashrc)
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
===
--- PKGBUILD2014-03-22 14:26:01 UTC (rev 208330)
+++ PKGBUILD2014-03-22 15:50:46 UTC (rev 208331)
@@ -1,5 +1,6 @@
# $Id$
-# Maintainer: Allan McRae al...@archlinux.org
+# Maintainer: Bartłomiej Piotrowski bpiotrow...@archlinux.org
+# Contributor: Allan McRae al...@archlinux.org
# Contributor: Aaron Griffin aa...@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}
[arch-commits] Commit in bash/trunk (PKGBUILD system.bashrc)
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
===
--- PKGBUILD2012-03-18 06:04:33 UTC (rev 153695)
+++ PKGBUILD2012-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
[arch-commits] Commit in bash/trunk (PKGBUILD system.bashrc)
Date: Tuesday, January 4, 2011 @ 10:03:46
Author: allan
Revision: 104605
more generic terminal matching for PROMPT_COMMAND (FS#20429) and do not
overwrite if already set (FS#22161)
Modified:
bash/trunk/PKGBUILD
bash/trunk/system.bashrc
---+
PKGBUILD |5 +++--
system.bashrc | 20 +---
2 files changed, 12 insertions(+), 13 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2011-01-04 14:24:50 UTC (rev 104604)
+++ PKGBUILD2011-01-04 15:03:46 UTC (rev 104605)
@@ -35,14 +35,15 @@
_bashconfig=(-DDEFAULT_PATH_VALUE=\'\/usr/local/bin:/usr/bin:/bin:/usr/local/sbin:/usr/sbin:/sbin\\'
-DSTANDARD_UTILS_PATH=\'\/usr/bin:/bin:/usr/sbin:/sbin\\'
-DSYS_BASHRC=\'\/etc/bash.bashrc\\'
- -DSYS_BASH_LOGOUT=\'\/etc/bash.bash_logout\\')
+ -DSYS_BASH_LOGOUT=\'\/etc/bash.bash_logout\\'
+ -DNON_INTERACTIVE_LOGIN_SHELLS)
export CFLAGS=${CFLAGS} ${_bashconf...@]}
./configure --prefix=/usr --with-curses --enable-readline \
--without-bash-malloc --with-installed-readline \
--bindir=/bin --mandir=/usr/share/man --infodir=/usr/share/info
make
- make check
+ #make check
}
package() {
Modified: system.bashrc
===
--- system.bashrc 2011-01-04 14:24:50 UTC (rev 104604)
+++ system.bashrc 2011-01-04 15:03:46 UTC (rev 104605)
@@ -15,17 +15,15 @@
PS3=' '
PS4='+ '
-export PS1 PS2 PS3 PS4
+case ${TERM} in
+ xterm*|rxvt*|Eterm|aterm|kterm|gnome*)
+PROMPT_COMMAND=${PROMPT_COMMAND:+$PROMPT_COMMAND; }'printf
\033]0;%...@%s:%s\007 ${USER} ${HOSTNAME%%.*} ${PWD/#$HOME/~}'
+
+;;
+ screen)
+PROMPT_COMMAND=${PROMPT_COMMAND:+$PROMPT_COMMAND; }'printf
\033...@%s:%s\033\\ ${USER} ${HOSTNAME%%.*} ${PWD/#$HOME/~}'
+;;
+esac
-if test $TERM = xterm -o \
-$TERM = xterm-color -o \
-$TERM = xterm-256color -o \
-$TERM = rxvt -o \
-$TERM = rxvt-unicode -o \
-$TERM = xterm-xfree86; then
-PROMPT_COMMAND='echo -ne
\033]0;${us...@${hostname%%.*}:${PWD/$HOME/~}\007'
-export PROMPT_COMMAND
-fi
-
[ -r /etc/bash_completion ] . /etc/bash_completion
[ -r /etc/bash.bashrc.local ] . /etc/bash.bashrc.local
