File git-13-e8d89ec1b9ff6dfe144665a7bab60dda9079adf6... of Package aaa_base.4819

Overview Repositories Revisions Requests Users Attributes Meta

File git-13-e8d89ec1b9ff6dfe144665a7bab60dda9079adf6.patch of Package aaa_base.4819

commit e8d89ec1b9ff6dfe144665a7bab60dda9079adf6
Author: Werner Fink <werner@suse.de>
Date:   Tue Nov 24 10:58:35 2015 +0100

Use the `+' for find's -exec option as this also respects white spaces
    in files names but is more like xargs.  Respect status lines of screen
    sessions.

diff --git a/files/etc/bash.bashrc b/files/etc/bash.bashrc
index 982499d..f30fe60 100644
--- a/files/etc/bash.bashrc
+++ b/files/etc/bash.bashrc
@@ -142,7 +142,7 @@ case "$-" in
 	    elif test -n "$_tsl" -a "$_fsl" ; then
 		TS1="$_sc$_tsl%s@%s:%s$_fsl$_rc"
 	    fi
-	    unset _tsl _fsl _sc _rc
+	    unset _isl _tsl _fsl _sc _rc
 	    ppwd () {
 		local dir
 		local -i width
@@ -182,7 +182,7 @@ case "$-" in
 	    _p=">"
 	fi
 	if test -z "$EMACS" -a -z "$MC_SID" -a -z "$restricted" -a \
-		-n "$DISPLAY" -a ! -r $HOME/.bash.expert
+		-z "$STY" -a -n "$DISPLAY" -a ! -r $HOME/.bash.expert
 	then
 	    _t="\[\$(ppwd)\]"
 	else
diff --git a/files/etc/cron.daily/suse.de-backup-rc.config b/files/etc/cron.daily/suse.de-backup-rc.config
index 9c871c0..46fc27a 100755
--- a/files/etc/cron.daily/suse.de-backup-rc.config
+++ b/files/etc/cron.daily/suse.de-backup-rc.config
@@ -31,7 +31,7 @@ if test -n "$RCCONFIG_BACKUP_DIR" -a -e /etc/sysconfig ; then
     test -f /etc/rc.config && ETC_RCCONFIG="/etc/rc.config"
     test -e $RCCONFIG_BACKUP_DIR/sysconfig_recent_md5 && \
         OLD_MD5="`cat $RCCONFIG_BACKUP_DIR/sysconfig_recent_md5`"
-    NEW_MD5="`find $ETC_RCCONFIG /etc/sysconfig -type f –exec cat {} \; | md5sum`"
+    NEW_MD5="`find $ETC_RCCONFIG /etc/sysconfig -type f –exec cat {} \+ | md5sum`"
     if test "$OLD_MD5" != "$NEW_MD5" ; then
         DATESTRING=`date +"%Y%m%d"`
 
diff --git a/files/etc/csh.cshrc b/files/etc/csh.cshrc
index f752308..f47b18f 100644
--- a/files/etc/csh.cshrc
+++ b/files/etc/csh.cshrc
@@ -116,7 +116,7 @@ if ( -o /dev/$tty && -c /dev/$tty ) then
   if ( -x /usr/bin/biff ) /usr/bin/biff y
   # If we're running under X11
   if ( ${?DISPLAY} ) then
-    if ( ${?TERM} && ${?EMACS} == 0 && ${?MC_SID} == 0 && ! -r $HOME/.csh.expert ) then
+    if ( ${?TERM} && ${?EMACS} == 0 && ${?MC_SID} == 0 && ${?STY} == 0 && ! -r $HOME/.csh.expert ) then
       if ( ${TERM} == "xterm" ) then
         alias cwdcmd '(echo -n "\033]2;$USER on ${HOST}: $cwd\007\033]1;$HOST\007" > /dev/$tty)'
         cd .

Places

File git-13-e8d89ec1b9ff6dfe144665a7bab60dda9079adf6.patch of Package aaa_base.4819

Places