File git-05-be5760cab096493812ebe05d33d44db021d509e6.patch of Package aaa_base.openSUSE_Leap_42.2_Update
commit be5760cab096493812ebe05d33d44db021d509e6
Author: Werner Fink <werner@suse.de>
Date: Mon Mar 9 15:26:21 2015 +0100
Handle also command lines starting with the env command
as this is used by gnome xsessions (bsc#906900)
Signed-off-by: Werner Fink <werner@suse.de>
diff --git a/files/etc/profile.d/profile.csh b/files/etc/profile.d/profile.csh
index d4d9700..6dc4e99 100644
--- a/files/etc/profile.d/profile.csh
+++ b/files/etc/profile.d/profile.csh
@@ -113,13 +113,21 @@ if ( ! ${?WINDOWMANAGER} ) then
set default_wm="${default_wm:t}"
if ( -s ${desktop:q} ) then
set wm="`sed -rn '/^Exec=/{s@[^=]*=([^=]*)@\1@p;}' ${desktop:q}`"
- foreach val ($path /usr/X11R6/bin /usr/openwin/bin)
- if ( ${val:q} =~ *.* ) continue
- set val="${val:q}/${wm:q}"
- if ( ! -x ${val:q} ) continue
- setenv WINDOWMANAGER "${val:q}"
- break
- end
+ switch ("${wm:q}")
+ case /usr/bin/env*:
+ case env*:
+ setenv WINDOWMANAGER "${wm:q}"
+ breaksw
+ default:
+ foreach val ($path /usr/X11R6/bin /usr/openwin/bin)
+ if ( ${val:q} =~ *.* ) continue
+ set val="${val:q}/${wm:q}"
+ if ( ! -x ${val:q} ) continue
+ setenv WINDOWMANAGER "${val:q}"
+ break
+ end
+ breaksw
+ endsw
unset val wm
endif
unset desktop
diff --git a/files/etc/profile.d/profile.sh b/files/etc/profile.d/profile.sh
index b456680..ab8431b 100644
--- a/files/etc/profile.d/profile.sh
+++ b/files/etc/profile.d/profile.sh
@@ -113,6 +113,10 @@ if test -z "$WINDOWMANAGER" ; then
if test -s "$desktop" ; then
while read -r line; do
case ${line} in
+ Exec=/usr/bin/env*|Exec=env*)
+ WINDOWMANAGER="${line#Exec=}"
+ break
+ ;;
Exec=*) WINDOWMANAGER="$(command -v ${line#Exec=})"
break
esac