SHA256
1
0
forked from pool/xinit

Accepting request 306145 from home:Ledest:bashisms

fix bashism in startx script

OBS-URL: https://build.opensuse.org/request/show/306145
OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xinit?expand=0&rev=29
This commit is contained in:
Egbert Eich 2015-05-10 08:55:39 +00:00 committed by Git OBS Bridge
parent 64fe952912
commit d7e6048d71
2 changed files with 9 additions and 2 deletions

View File

@ -31,7 +31,7 @@ Index: xinit-1.3.4/startx.cpp
+XCOMM
+XCOMM find wmlist utility, else take twm as default (always there :-))
+XCOMM
+type -p wmlist &> /dev/null && WMLIST="`for i in $(wmlist); do echo $i; done | sort`"
+type wmlist >/dev/null 2>&1 && WMLIST="`for i in $(wmlist); do echo $i; done | sort`"
+test -z "$WMLIST" && WMLIST="twm"
+
+test "$1" = "--" || { test -n "$1" && WANTEDWM=`basename "$1"` ; }
@ -47,7 +47,7 @@ Index: xinit-1.3.4/startx.cpp
+XCOMM
+XCOMM is it reachable via $PATH?
+XCOMM
+ type -p $WM &> /dev/null || {
+ type $WM >/dev/null 2>&1 || {
+
+ echo "`basename $0`: error: the requested window manager '$1' could not be found!"
+ echo "Window manager must be one of (currently installed window amangers):"

View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Sun May 10 01:21:00 UTC 2015 - Led <ledest@gmail.com>
- fix bashism in startx script
- update patches:
* xinit-suse.patch
-------------------------------------------------------------------
Wed Mar 18 11:47:43 UTC 2015 - sndirsch@suse.com