Date: Thursday, April 3, 2014 @ 20:46:03 Author: bpiotrowski Revision: 209767
archrelease: copy trunk to testing-i686, testing-x86_64 Added: bash/repos/testing-i686/ bash/repos/testing-i686/PKGBUILD (from rev 209766, bash/trunk/PKGBUILD) bash/repos/testing-i686/bash-4.2-do-not-use-memcpy-on-overlapping-memory.patch (from rev 209766, bash/trunk/bash-4.2-do-not-use-memcpy-on-overlapping-memory.patch) bash/repos/testing-i686/bash-4.3-debug-trap.patch (from rev 209766, bash/trunk/bash-4.3-debug-trap.patch) bash/repos/testing-i686/bash-4.3-test-nameref.patch (from rev 209766, bash/trunk/bash-4.3-test-nameref.patch) bash/repos/testing-i686/bash.install (from rev 209766, bash/trunk/bash.install) bash/repos/testing-i686/dot.bash_logout (from rev 209766, bash/trunk/dot.bash_logout) bash/repos/testing-i686/dot.bash_profile (from rev 209766, bash/trunk/dot.bash_profile) bash/repos/testing-i686/dot.bashrc (from rev 209766, bash/trunk/dot.bashrc) bash/repos/testing-i686/system.bash_logout (from rev 209766, bash/trunk/system.bash_logout) bash/repos/testing-i686/system.bashrc (from rev 209766, bash/trunk/system.bashrc) bash/repos/testing-x86_64/ bash/repos/testing-x86_64/PKGBUILD (from rev 209766, bash/trunk/PKGBUILD) bash/repos/testing-x86_64/bash-4.2-do-not-use-memcpy-on-overlapping-memory.patch (from rev 209766, bash/trunk/bash-4.2-do-not-use-memcpy-on-overlapping-memory.patch) bash/repos/testing-x86_64/bash-4.3-debug-trap.patch (from rev 209766, bash/trunk/bash-4.3-debug-trap.patch) bash/repos/testing-x86_64/bash-4.3-test-nameref.patch (from rev 209766, bash/trunk/bash-4.3-test-nameref.patch) bash/repos/testing-x86_64/bash.install (from rev 209766, bash/trunk/bash.install) bash/repos/testing-x86_64/dot.bash_logout (from rev 209766, bash/trunk/dot.bash_logout) bash/repos/testing-x86_64/dot.bash_profile (from rev 209766, bash/trunk/dot.bash_profile) bash/repos/testing-x86_64/dot.bashrc (from rev 209766, bash/trunk/dot.bashrc) bash/repos/testing-x86_64/system.bash_logout (from rev 209766, bash/trunk/system.bash_logout) bash/repos/testing-x86_64/system.bashrc (from rev 209766, bash/trunk/system.bashrc) -----------------------------------------------------------------------+ testing-i686/PKGBUILD | 97 ++++++++++ testing-i686/bash-4.2-do-not-use-memcpy-on-overlapping-memory.patch | 12 + testing-i686/bash-4.3-debug-trap.patch | 30 +++ testing-i686/bash-4.3-test-nameref.patch | 25 ++ testing-i686/bash.install | 16 + testing-i686/dot.bash_logout | 3 testing-i686/dot.bash_profile | 5 testing-i686/dot.bashrc | 9 testing-i686/system.bash_logout | 3 testing-i686/system.bashrc | 23 ++ testing-x86_64/PKGBUILD | 97 ++++++++++ testing-x86_64/bash-4.2-do-not-use-memcpy-on-overlapping-memory.patch | 12 + testing-x86_64/bash-4.3-debug-trap.patch | 30 +++ testing-x86_64/bash-4.3-test-nameref.patch | 25 ++ testing-x86_64/bash.install | 16 + testing-x86_64/dot.bash_logout | 3 testing-x86_64/dot.bash_profile | 5 testing-x86_64/dot.bashrc | 9 testing-x86_64/system.bash_logout | 3 testing-x86_64/system.bashrc | 23 ++ 20 files changed, 446 insertions(+) Copied: bash/repos/testing-i686/PKGBUILD (from rev 209766, bash/trunk/PKGBUILD) =================================================================== --- testing-i686/PKGBUILD (rev 0) +++ testing-i686/PKGBUILD 2014-04-03 18:46:03 UTC (rev 209767) @@ -0,0 +1,97 @@ +# $Id$ +# Maintainer: Bartłomiej Piotrowski <bpiotrow...@archlinux.org> +# Contributor: Allan McRae <al...@archlinux.org> +# Contributor: Aaron Griffin <aa...@archlinux.org> + +pkgname=bash +_basever=4.3 +_patchlevel=008 +pkgver=$_basever.$_patchlevel +pkgrel=1 +pkgdesc='The GNU Bourne Again shell' +arch=('i686' 'x86_64') +license=('GPL') +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') +provides=('sh') +install=bash.install +source=(http://ftp.gnu.org/gnu/bash/bash-$_basever.tar.gz{,.sig} + dot.bashrc + dot.bash_profile + dot.bash_logout + system.bashrc + system.bash_logout) + +if [[ $((10#${_patchlevel})) -gt 0 ]]; 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 +fi + +prepare() { + cd $pkgname-$_basever + + for (( _p=1; _p<=$((10#${_patchlevel})); _p++ )); do + msg "applying patch bash${_basever//.}-$(printf "%03d" $_p)" + patch -p0 -i ../bash${_basever//.}-$(printf "%03d" $_p) + done +} + +build() { + cd $pkgname-$_basever + + _bashconfig=(-DDEFAULT_PATH_VALUE=\'\"/usr/local/sbin:/usr/local/bin:/usr/bin\"\' + -DSTANDARD_UTILS_PATH=\'\"/usr/bin\"\' + -DSYS_BASHRC=\'\"/etc/bash.bashrc\"\' + -DSYS_BASH_LOGOUT=\'\"/etc/bash.bash_logout\"\') + export CFLAGS="${CFLAGS} ${_bashconfig[@]}" + + ./configure --prefix=/usr --with-curses --enable-readline \ + --without-bash-malloc --with-installed-readline + make +} + +check() { + make -C $pkgname-$_basever check +} + +package() { + make -C $pkgname-$_basever DESTDIR="$pkgdir" install + 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 + + # user configuration file skeletons + 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' + 'SKIP' + '027d6bd8f5f6a06b75bb7698cb478089' + '2902e0fee7a9168f3a4fd2ccd60ff047' + '42f4400ed2314bd7519c020d0187edc5' + '561949793177116b7be29a07c385ba8b' + '472f536d7c9e8250dc4568ec4cfaf294' + '1ab682b4e36afa4cf1b426aa7ac81c0d' + 'SKIP' + '8fc22cf50ec85da00f6af3d66f7ddc1b' + 'SKIP' + 'a41728eca78858758e26b5dea64ae506' + 'SKIP' + 'bf8d53d227829d67235927689a03cc7a' + 'SKIP' + 'c0c00935c8b8ffff76e8ab77e7be7d15' + 'SKIP' + '6f01e364cd092faa28dd7119f47ddb5f' + 'SKIP' + 'dcf471d222bcd83283d3094e6ceeb6f8' + 'SKIP' + 'f7553416646dc26c266454c78a916d36' + 'SKIP') Copied: bash/repos/testing-i686/bash-4.2-do-not-use-memcpy-on-overlapping-memory.patch (from rev 209766, bash/trunk/bash-4.2-do-not-use-memcpy-on-overlapping-memory.patch) =================================================================== --- testing-i686/bash-4.2-do-not-use-memcpy-on-overlapping-memory.patch (rev 0) +++ testing-i686/bash-4.2-do-not-use-memcpy-on-overlapping-memory.patch 2014-04-03 18:46:03 UTC (rev 209767) @@ -0,0 +1,12 @@ +diff -Naur bash-4.2-orig/general.c bash-4.2/general.c +--- bash-4.2-orig/general.c 2010-12-13 06:06:27.000000000 +1000 ++++ bash-4.2/general.c 2013-08-25 21:52:36.681484302 +1000 +@@ -766,7 +766,7 @@ + *nbeg++ = '.'; + + nlen = nend - ntail; +- memcpy (nbeg, ntail, nlen); ++ memmove (nbeg, ntail, nlen); + nbeg[nlen] = '\0'; + + return name; Copied: bash/repos/testing-i686/bash-4.3-debug-trap.patch (from rev 209766, bash/trunk/bash-4.3-debug-trap.patch) =================================================================== --- testing-i686/bash-4.3-debug-trap.patch (rev 0) +++ testing-i686/bash-4.3-debug-trap.patch 2014-04-03 18:46:03 UTC (rev 209767) @@ -0,0 +1,30 @@ +*** ../bash-4.3/trap.c 2014-02-05 10:03:21.000000000 -0500 +--- trap.c 2014-02-28 09:51:43.000000000 -0500 +*************** +*** 921,925 **** + + #if defined (JOB_CONTROL) +! save_pipeline (1); /* XXX only provides one save level */ + #endif + +--- 921,926 ---- + + #if defined (JOB_CONTROL) +! if (sig != DEBUG_TRAP) /* run_debug_trap does this */ +! save_pipeline (1); /* XXX only provides one save level */ + #endif + +*************** +*** 941,945 **** + + #if defined (JOB_CONTROL) +! restore_pipeline (1); + #endif + +--- 942,947 ---- + + #if defined (JOB_CONTROL) +! if (sig != DEBUG_TRAP) /* run_debug_trap does this */ +! restore_pipeline (1); + #endif + Copied: bash/repos/testing-i686/bash-4.3-test-nameref.patch (from rev 209766, bash/trunk/bash-4.3-test-nameref.patch) =================================================================== --- testing-i686/bash-4.3-test-nameref.patch (rev 0) +++ testing-i686/bash-4.3-test-nameref.patch 2014-04-03 18:46:03 UTC (rev 209767) @@ -0,0 +1,25 @@ +*** ../bash-4.3/test.c 2014-02-04 16:52:58.000000000 -0500 +--- test.c 2014-02-28 21:22:44.000000000 -0500 +*************** +*** 647,652 **** + + case 'R': +! v = find_variable (arg); +! return (v && invisible_p (v) == 0 && var_isset (v) && nameref_p (v) ? TRUE : FALSE); + } + +--- 647,652 ---- + + case 'R': +! v = find_variable_noref (arg); +! return ((v && invisible_p (v) == 0 && var_isset (v) && nameref_p (v)) ? TRUE : FALSE); + } + +*************** +*** 724,727 **** +--- 724,728 ---- + case 'u': case 'v': case 'w': case 'x': case 'z': + case 'G': case 'L': case 'O': case 'S': case 'N': ++ case 'R': + return (1); + } Copied: bash/repos/testing-i686/bash.install (from rev 209766, bash/trunk/bash.install) =================================================================== --- testing-i686/bash.install (rev 0) +++ testing-i686/bash.install 2014-04-03 18:46:03 UTC (rev 209767) @@ -0,0 +1,16 @@ +info_dir=usr/share/info +info_files=(bash.info) + +post_upgrade() { + [ -x usr/bin/install-info ] || return 0 + for f in ${info_files[@]}; do + usr/bin/install-info ${info_dir}/$f.gz ${info_dir}/dir 2> /dev/null + done +} + +pre_remove() { + [ -x usr/bin/install-info ] || return 0 + for f in ${info_files[@]}; do + usr/bin/install-info --delete ${info_dir}/$f.gz ${info_dir}/dir 2> /dev/null + done +} Copied: bash/repos/testing-i686/dot.bash_logout (from rev 209766, bash/trunk/dot.bash_logout) =================================================================== --- testing-i686/dot.bash_logout (rev 0) +++ testing-i686/dot.bash_logout 2014-04-03 18:46:03 UTC (rev 209767) @@ -0,0 +1,3 @@ +# +# ~/.bash_logout +# Copied: bash/repos/testing-i686/dot.bash_profile (from rev 209766, bash/trunk/dot.bash_profile) =================================================================== --- testing-i686/dot.bash_profile (rev 0) +++ testing-i686/dot.bash_profile 2014-04-03 18:46:03 UTC (rev 209767) @@ -0,0 +1,5 @@ +# +# ~/.bash_profile +# + +[[ -f ~/.bashrc ]] && . ~/.bashrc Copied: bash/repos/testing-i686/dot.bashrc (from rev 209766, bash/trunk/dot.bashrc) =================================================================== --- testing-i686/dot.bashrc (rev 0) +++ testing-i686/dot.bashrc 2014-04-03 18:46:03 UTC (rev 209767) @@ -0,0 +1,9 @@ +# +# ~/.bashrc +# + +# If not running interactively, don't do anything +[[ $- != *i* ]] && return + +alias ls='ls --color=auto' +PS1='[\u@\h \W]\$ ' Copied: bash/repos/testing-i686/system.bash_logout (from rev 209766, bash/trunk/system.bash_logout) =================================================================== --- testing-i686/system.bash_logout (rev 0) +++ testing-i686/system.bash_logout 2014-04-03 18:46:03 UTC (rev 209767) @@ -0,0 +1,3 @@ +# +# /etc/bash.bash_logout +# Copied: bash/repos/testing-i686/system.bashrc (from rev 209766, bash/trunk/system.bashrc) =================================================================== --- testing-i686/system.bashrc (rev 0) +++ testing-i686/system.bashrc 2014-04-03 18:46:03 UTC (rev 209767) @@ -0,0 +1,23 @@ +# +# /etc/bash.bashrc +# + +# If not running interactively, don't do anything +[[ $- != *i* ]] && return + +PS1='[\u@\h \W]\$ ' +PS2='> ' +PS3='> ' +PS4='+ ' + +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/\~}"' + + ;; + screen) + PROMPT_COMMAND=${PROMPT_COMMAND:+$PROMPT_COMMAND; }'printf "\033_%s@%s:%s\033\\" "${USER}" "${HOSTNAME%%.*}" "${PWD/#$HOME/\~}"' + ;; +esac + +[ -r /usr/share/bash-completion/bash_completion ] && . /usr/share/bash-completion/bash_completion Copied: bash/repos/testing-x86_64/PKGBUILD (from rev 209766, bash/trunk/PKGBUILD) =================================================================== --- testing-x86_64/PKGBUILD (rev 0) +++ testing-x86_64/PKGBUILD 2014-04-03 18:46:03 UTC (rev 209767) @@ -0,0 +1,97 @@ +# $Id$ +# Maintainer: Bartłomiej Piotrowski <bpiotrow...@archlinux.org> +# Contributor: Allan McRae <al...@archlinux.org> +# Contributor: Aaron Griffin <aa...@archlinux.org> + +pkgname=bash +_basever=4.3 +_patchlevel=008 +pkgver=$_basever.$_patchlevel +pkgrel=1 +pkgdesc='The GNU Bourne Again shell' +arch=('i686' 'x86_64') +license=('GPL') +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') +provides=('sh') +install=bash.install +source=(http://ftp.gnu.org/gnu/bash/bash-$_basever.tar.gz{,.sig} + dot.bashrc + dot.bash_profile + dot.bash_logout + system.bashrc + system.bash_logout) + +if [[ $((10#${_patchlevel})) -gt 0 ]]; 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 +fi + +prepare() { + cd $pkgname-$_basever + + for (( _p=1; _p<=$((10#${_patchlevel})); _p++ )); do + msg "applying patch bash${_basever//.}-$(printf "%03d" $_p)" + patch -p0 -i ../bash${_basever//.}-$(printf "%03d" $_p) + done +} + +build() { + cd $pkgname-$_basever + + _bashconfig=(-DDEFAULT_PATH_VALUE=\'\"/usr/local/sbin:/usr/local/bin:/usr/bin\"\' + -DSTANDARD_UTILS_PATH=\'\"/usr/bin\"\' + -DSYS_BASHRC=\'\"/etc/bash.bashrc\"\' + -DSYS_BASH_LOGOUT=\'\"/etc/bash.bash_logout\"\') + export CFLAGS="${CFLAGS} ${_bashconfig[@]}" + + ./configure --prefix=/usr --with-curses --enable-readline \ + --without-bash-malloc --with-installed-readline + make +} + +check() { + make -C $pkgname-$_basever check +} + +package() { + make -C $pkgname-$_basever DESTDIR="$pkgdir" install + 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 + + # user configuration file skeletons + 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' + 'SKIP' + '027d6bd8f5f6a06b75bb7698cb478089' + '2902e0fee7a9168f3a4fd2ccd60ff047' + '42f4400ed2314bd7519c020d0187edc5' + '561949793177116b7be29a07c385ba8b' + '472f536d7c9e8250dc4568ec4cfaf294' + '1ab682b4e36afa4cf1b426aa7ac81c0d' + 'SKIP' + '8fc22cf50ec85da00f6af3d66f7ddc1b' + 'SKIP' + 'a41728eca78858758e26b5dea64ae506' + 'SKIP' + 'bf8d53d227829d67235927689a03cc7a' + 'SKIP' + 'c0c00935c8b8ffff76e8ab77e7be7d15' + 'SKIP' + '6f01e364cd092faa28dd7119f47ddb5f' + 'SKIP' + 'dcf471d222bcd83283d3094e6ceeb6f8' + 'SKIP' + 'f7553416646dc26c266454c78a916d36' + 'SKIP') Copied: bash/repos/testing-x86_64/bash-4.2-do-not-use-memcpy-on-overlapping-memory.patch (from rev 209766, bash/trunk/bash-4.2-do-not-use-memcpy-on-overlapping-memory.patch) =================================================================== --- testing-x86_64/bash-4.2-do-not-use-memcpy-on-overlapping-memory.patch (rev 0) +++ testing-x86_64/bash-4.2-do-not-use-memcpy-on-overlapping-memory.patch 2014-04-03 18:46:03 UTC (rev 209767) @@ -0,0 +1,12 @@ +diff -Naur bash-4.2-orig/general.c bash-4.2/general.c +--- bash-4.2-orig/general.c 2010-12-13 06:06:27.000000000 +1000 ++++ bash-4.2/general.c 2013-08-25 21:52:36.681484302 +1000 +@@ -766,7 +766,7 @@ + *nbeg++ = '.'; + + nlen = nend - ntail; +- memcpy (nbeg, ntail, nlen); ++ memmove (nbeg, ntail, nlen); + nbeg[nlen] = '\0'; + + return name; Copied: bash/repos/testing-x86_64/bash-4.3-debug-trap.patch (from rev 209766, bash/trunk/bash-4.3-debug-trap.patch) =================================================================== --- testing-x86_64/bash-4.3-debug-trap.patch (rev 0) +++ testing-x86_64/bash-4.3-debug-trap.patch 2014-04-03 18:46:03 UTC (rev 209767) @@ -0,0 +1,30 @@ +*** ../bash-4.3/trap.c 2014-02-05 10:03:21.000000000 -0500 +--- trap.c 2014-02-28 09:51:43.000000000 -0500 +*************** +*** 921,925 **** + + #if defined (JOB_CONTROL) +! save_pipeline (1); /* XXX only provides one save level */ + #endif + +--- 921,926 ---- + + #if defined (JOB_CONTROL) +! if (sig != DEBUG_TRAP) /* run_debug_trap does this */ +! save_pipeline (1); /* XXX only provides one save level */ + #endif + +*************** +*** 941,945 **** + + #if defined (JOB_CONTROL) +! restore_pipeline (1); + #endif + +--- 942,947 ---- + + #if defined (JOB_CONTROL) +! if (sig != DEBUG_TRAP) /* run_debug_trap does this */ +! restore_pipeline (1); + #endif + Copied: bash/repos/testing-x86_64/bash-4.3-test-nameref.patch (from rev 209766, bash/trunk/bash-4.3-test-nameref.patch) =================================================================== --- testing-x86_64/bash-4.3-test-nameref.patch (rev 0) +++ testing-x86_64/bash-4.3-test-nameref.patch 2014-04-03 18:46:03 UTC (rev 209767) @@ -0,0 +1,25 @@ +*** ../bash-4.3/test.c 2014-02-04 16:52:58.000000000 -0500 +--- test.c 2014-02-28 21:22:44.000000000 -0500 +*************** +*** 647,652 **** + + case 'R': +! v = find_variable (arg); +! return (v && invisible_p (v) == 0 && var_isset (v) && nameref_p (v) ? TRUE : FALSE); + } + +--- 647,652 ---- + + case 'R': +! v = find_variable_noref (arg); +! return ((v && invisible_p (v) == 0 && var_isset (v) && nameref_p (v)) ? TRUE : FALSE); + } + +*************** +*** 724,727 **** +--- 724,728 ---- + case 'u': case 'v': case 'w': case 'x': case 'z': + case 'G': case 'L': case 'O': case 'S': case 'N': ++ case 'R': + return (1); + } Copied: bash/repos/testing-x86_64/bash.install (from rev 209766, bash/trunk/bash.install) =================================================================== --- testing-x86_64/bash.install (rev 0) +++ testing-x86_64/bash.install 2014-04-03 18:46:03 UTC (rev 209767) @@ -0,0 +1,16 @@ +info_dir=usr/share/info +info_files=(bash.info) + +post_upgrade() { + [ -x usr/bin/install-info ] || return 0 + for f in ${info_files[@]}; do + usr/bin/install-info ${info_dir}/$f.gz ${info_dir}/dir 2> /dev/null + done +} + +pre_remove() { + [ -x usr/bin/install-info ] || return 0 + for f in ${info_files[@]}; do + usr/bin/install-info --delete ${info_dir}/$f.gz ${info_dir}/dir 2> /dev/null + done +} Copied: bash/repos/testing-x86_64/dot.bash_logout (from rev 209766, bash/trunk/dot.bash_logout) =================================================================== --- testing-x86_64/dot.bash_logout (rev 0) +++ testing-x86_64/dot.bash_logout 2014-04-03 18:46:03 UTC (rev 209767) @@ -0,0 +1,3 @@ +# +# ~/.bash_logout +# Copied: bash/repos/testing-x86_64/dot.bash_profile (from rev 209766, bash/trunk/dot.bash_profile) =================================================================== --- testing-x86_64/dot.bash_profile (rev 0) +++ testing-x86_64/dot.bash_profile 2014-04-03 18:46:03 UTC (rev 209767) @@ -0,0 +1,5 @@ +# +# ~/.bash_profile +# + +[[ -f ~/.bashrc ]] && . ~/.bashrc Copied: bash/repos/testing-x86_64/dot.bashrc (from rev 209766, bash/trunk/dot.bashrc) =================================================================== --- testing-x86_64/dot.bashrc (rev 0) +++ testing-x86_64/dot.bashrc 2014-04-03 18:46:03 UTC (rev 209767) @@ -0,0 +1,9 @@ +# +# ~/.bashrc +# + +# If not running interactively, don't do anything +[[ $- != *i* ]] && return + +alias ls='ls --color=auto' +PS1='[\u@\h \W]\$ ' Copied: bash/repos/testing-x86_64/system.bash_logout (from rev 209766, bash/trunk/system.bash_logout) =================================================================== --- testing-x86_64/system.bash_logout (rev 0) +++ testing-x86_64/system.bash_logout 2014-04-03 18:46:03 UTC (rev 209767) @@ -0,0 +1,3 @@ +# +# /etc/bash.bash_logout +# Copied: bash/repos/testing-x86_64/system.bashrc (from rev 209766, bash/trunk/system.bashrc) =================================================================== --- testing-x86_64/system.bashrc (rev 0) +++ testing-x86_64/system.bashrc 2014-04-03 18:46:03 UTC (rev 209767) @@ -0,0 +1,23 @@ +# +# /etc/bash.bashrc +# + +# If not running interactively, don't do anything +[[ $- != *i* ]] && return + +PS1='[\u@\h \W]\$ ' +PS2='> ' +PS3='> ' +PS4='+ ' + +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/\~}"' + + ;; + screen) + PROMPT_COMMAND=${PROMPT_COMMAND:+$PROMPT_COMMAND; }'printf "\033_%s@%s:%s\033\\" "${USER}" "${HOSTNAME%%.*}" "${PWD/#$HOME/\~}"' + ;; +esac + +[ -r /usr/share/bash-completion/bash_completion ] && . /usr/share/bash-completion/bash_completion