From fdf03cd2fdfd9cd5635334c5e4dc2bb23e92e37a Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Thu, 27 Mar 2014 12:29:19 +0100 Subject: Remove unixware / sco support We don't support SCO / Unixware anymore, so lets remove the SCO / Unixware specific bits from startx and xinitrc SCO support was removed from the server in 2010: http://lists.x.org/archives/xorg-devel/2010-December/017209.html Signed-off-by: Hans de Goede Reviewed-by: Mark Kettenis Reviewed-by: Gaetan Nadon --- xinitrc.cpp | 43 ------------------------------------------- 1 file changed, 43 deletions(-) (limited to 'xinitrc.cpp') diff --git a/xinitrc.cpp b/xinitrc.cpp index 81c238b..14d3cbc 100644 --- a/xinitrc.cpp +++ b/xinitrc.cpp @@ -41,49 +41,6 @@ fi XCOMM start some nice programs -#if defined(__SCO__) || defined(__UNIXWARE__) -if [ -r /etc/default/xdesktops ]; then - . /etc/default/xdesktops -fi - -if [ -r $HOME/.x11rc ]; then - . $HOME/.x11rc -else - if [ -r /etc/default/X11 ]; then - . /etc/default/X11 - fi -fi - -#if defined(__SCO__) -if [ -n "$XSESSION" ]; then - case "$XSESSION" in - [Yy][Ee][Ss]) - [ -x /usr/bin/X11/scosession ] && exec /usr/bin/X11/scosession - ;; - esac -fi - -if [ -n "$XDESKTOP" ]; then - exec `eval echo $"$XDESKTOP"` -else - if [ -x /usr/bin/X11/pmwm -a -x /usr/bin/X11/scoterm ]; then - /usr/bin/X11/scoterm 2> /dev/null & - exec /usr/bin/X11/pmwm 2> /dev/null - fi -fi -#elif defined(__UNIXWARE__) -if [ -n "$XDESKTOP" ]; then - exec `eval echo $"$XDESKTOP"` -else - if [ -x /usr/X/bin/pmwm ]; then - exec /usr/X/bin/pmwm 2> /dev/null - fi -fi -#endif - -XCOMM This is the fallback case if nothing else is executed above -#endif /* !defined(__SCO__) && !defined(__UNIXWARE__) */ - if [ -d XINITDIR/xinitrc.d ] ; then for f in XINITDIR/xinitrc.d/?*.sh ; do [ -x "$f" ] && . "$f" -- cgit v1.2.3