Hello community, here is the log from the commit of package xinit for openSUSE:Factory checked in at 2015-03-16 09:37:32 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xinit (Old) and /work/SRC/openSUSE:Factory/.xinit.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xinit" Changes: -------- --- /work/SRC/openSUSE:Factory/xinit/xinit.changes 2015-01-30 06:11:15.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.xinit.new/xinit.changes 2015-03-16 09:37:33.000000000 +0100 @@ -1,0 +2,5 @@ +Wed Mar 11 13:30:04 UTC 2015 - [email protected] + +- Allow WINDOWMANAGER to be a command line string (bsc#920368) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xinit.spec ++++++ --- /var/tmp/diff_new_pack.GhLofP/_old 2015-03-16 09:37:34.000000000 +0100 +++ /var/tmp/diff_new_pack.GhLofP/_new 2015-03-16 09:37:34.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package xinit # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed ++++++ xinit.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/etc/X11/xinit/xinitrc.common new/etc/X11/xinit/xinitrc.common --- old/etc/X11/xinit/xinitrc.common 2014-01-08 14:57:23.000000000 +0100 +++ new/etc/X11/xinit/xinitrc.common 2015-03-12 11:34:07.000000000 +0100 @@ -64,7 +64,26 @@ # # Choose a window manager # -test -n "$WINDOWMANAGER" && WINDOWMANAGER="$(type -p $WINDOWMANAGER 2>/dev/null)" +if test -n "$WINDOWMANAGER" ; then + _epand_wm() + { + local x y z + for x in $WINDOWMANAGER ; do + case "$x" in + *=*) y="${y:+$y }$x" ;; + -*) y="${y:+$y }$x" ;; + *) if z="$(type -p $x 2>/dev/null)" ; then + y="${y:+$y }$z" + else + y="${y:+$y }$x" + fi + esac + done + test -n "$y" && WINDOWMANAGER="$y" + } + _epand_wm + unset _epand_wm +fi if test -z "$WINDOWMANAGER" ; then _find_wm() { @@ -94,7 +113,7 @@ [ "$line" = "$x" ] || break done < "$file" fi - WINDOWMANAGER=`type -p "$x"` + WINDOWMANAGER=$(type -p "$x") } _find_wm unset _find_wm -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
