From d11cf2567099267f7f20a4d2108bacdd90e206ea Mon Sep 17 00:00:00 2001 From: Clifford Wolf Date: Fri, 24 Dec 2004 02:49:59 +0000 Subject: [PATCH] Clifford Wolf: Fixed startx when no kde is installed .. in xorg and xfree86 [2004122300423002946] (https://www.rocklinux.net/submaster) git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@5349 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc --- package/x11/xfree86/startwm.patch | 4 ++-- package/x11/xorg/startwm.patch | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/x11/xfree86/startwm.patch b/package/x11/xfree86/startwm.patch index 26a3fe4f1..195c95da2 100644 --- a/package/x11/xfree86/startwm.patch +++ b/package/x11/xfree86/startwm.patch @@ -32,7 +32,7 @@ More flexible root application startup. Kind of ROCK Linux specific. + WINDOWMANAGER="${WINDOWMANAGER:-startkde}" + [ "$WINDOWMANAGER" = "gnome" ] && WINDOWMANAGER="gnome-session" + [ "$WINDOWMANAGER" = "kde" ] && WINDOWMANAGER="startkde" -+ [ "$WINDOWMANAGER" != "twm" ] && exec $WINDOWMANAGER ++ [ "$WINDOWMANAGER" != "twm" -a -n "$(type -p ${WINDOWMANAGER%% *})" ] && exec $WINDOWMANAGER + xsetroot -solid darkcyan ; exec twm ; exec xterm exec xsm fi @@ -60,5 +60,5 @@ More flexible root application startup. Kind of ROCK Linux specific. +WINDOWMANAGER="${WINDOWMANAGER:-startkde}" +[ "$WINDOWMANAGER" = "gnome" ] && WINDOWMANAGER="gnome-session" +[ "$WINDOWMANAGER" = "kde" ] && WINDOWMANAGER="startkde" -+[ "$WINDOWMANAGER" != "twm" ] && exec $WINDOWMANAGER ++[ "$WINDOWMANAGER" != "twm" -a -n "$(type -p ${WINDOWMANAGER%% *})" ] && exec $WINDOWMANAGER +xsetroot -solid darkcyan ; exec twm ; exec xterm diff --git a/package/x11/xorg/startwm.patch b/package/x11/xorg/startwm.patch index c94cda73f..897d28d72 100644 --- a/package/x11/xorg/startwm.patch +++ b/package/x11/xorg/startwm.patch @@ -32,7 +32,7 @@ More flexible root application startup. Kind of ROCK Linux specific. + WINDOWMANAGER="${WINDOWMANAGER:-startkde}" + [ "$WINDOWMANAGER" = "gnome" ] && WINDOWMANAGER="gnome-session" + [ "$WINDOWMANAGER" = "kde" ] && WINDOWMANAGER="startkde" -+ [ "$WINDOWMANAGER" != "twm" ] && exec $WINDOWMANAGER ++ [ "$WINDOWMANAGER" != "twm" -a -n "$(type -p ${WINDOWMANAGER%% *})" ] && exec $WINDOWMANAGER + xsetroot -solid darkcyan ; exec twm ; exec xterm exec xsm fi @@ -60,5 +60,5 @@ More flexible root application startup. Kind of ROCK Linux specific. +WINDOWMANAGER="${WINDOWMANAGER:-startkde}" +[ "$WINDOWMANAGER" = "gnome" ] && WINDOWMANAGER="gnome-session" +[ "$WINDOWMANAGER" = "kde" ] && WINDOWMANAGER="startkde" -+[ "$WINDOWMANAGER" != "twm" ] && exec $WINDOWMANAGER ++[ "$WINDOWMANAGER" != "twm" -a -n "$(type -p ${WINDOWMANAGER%% *})" ] && exec $WINDOWMANAGER +xsetroot -solid darkcyan ; exec twm ; exec xterm