bash-devel-git: update system.bashrc

3 files changed, 11 insertions, 11 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 0425ba4bbb51..b226ffc2a8d2 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,11 +1,10 @@
 # Generated by mksrcinfo v8
-# Thu Sep  7 13:04:32 UTC 2017
+# Sun Sep 10 18:02:59 UTC 2017
 pkgbase = bash-devel-git
 	pkgdesc = The GNU Bourne Again shell (development version)
 	pkgver = 4.0.alpha.r535.g560db36b
 	pkgrel = 1
 	url = http://www.gnu.org/software/bash/bash.html
-	install = bash.install
 	arch = i686
 	arch = x86_64
 	license = GPL
@@ -32,7 +31,7 @@ pkgbase = bash-devel-git
 	md5sums = 027d6bd8f5f6a06b75bb7698cb478089
 	md5sums = 2902e0fee7a9168f3a4fd2ccd60ff047
 	md5sums = 42f4400ed2314bd7519c020d0187edc5
-	md5sums = 561949793177116b7be29a07c385ba8b
+	md5sums = d8f3f334e72c0e30032eae1a1229aef1
 	md5sums = 472f536d7c9e8250dc4568ec4cfaf294
 
 pkgname = bash-devel-git
diff --git a/PKGBUILD b/PKGBUILD
index 1a98f39c073b..34f2b83c00cb 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -16,7 +16,6 @@ makedepends=('git')
 optdepends=('bash-completion: for tab completion')
 provides=('sh' 'bash=4.4')
 conflicts=('bash')
-install=bash.install
 source=('git+https://git.savannah.gnu.org/git/bash.git#branch=devel'
         'dot.bashrc'
         'dot.bash_profile'
@@ -27,7 +26,7 @@ md5sums=('SKIP'
          '027d6bd8f5f6a06b75bb7698cb478089'
          '2902e0fee7a9168f3a4fd2ccd60ff047'
          '42f4400ed2314bd7519c020d0187edc5'
-         '561949793177116b7be29a07c385ba8b'
+         'd8f3f334e72c0e30032eae1a1229aef1'
          '472f536d7c9e8250dc4568ec4cfaf294')
 
 pkgver() {
@@ -36,13 +35,16 @@ pkgver() {
 }
 
 build() {
-  cd bash  
+  cd bash
   _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\"\')
+               -DSYS_BASH_LOGOUT=\'\"/etc/bash.bash_logout\"\'
+               -DNON_INTERACTIVE_LOGIN_SHELLS)
   export CFLAGS="${CFLAGS} ${_bashconfig[@]}"
 
+  # Note: This package does not use the system readline, as it depends on 
+  # a development version which is usually not ABI-compatible.
   ./configure --prefix=/usr --with-curses --enable-readline \
               --without-bash-malloc
   make
diff --git a/system.bashrc b/system.bashrc
index 4d7a64344887..c484b2bc7716 100644
--- a/system.bashrc
+++ b/system.bashrc
@@ -5,17 +5,16 @@
 # If not running interactively, don't do anything
 [[ $- != *i* ]] && return
 
+[[ $DISPLAY ]] && shopt -s checkwinsize
+
 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)
+  screen*)
     PROMPT_COMMAND=${PROMPT_COMMAND:+$PROMPT_COMMAND; }'printf "\033_%s@%s:%s\033\\" "${USER}" "${HOSTNAME%%.*}" "${PWD/#$HOME/\~}"'
     ;;
 esac