Bug#168347: system default x-session-manager/xwindow-manager (patch)

[Osamu Aoki <osamu@debian.org>]

Hi,

I think it is good idea to do "unset REALSTARTUP". (Is it done
elsewhere?)

I attach a new 50xfree86-common_determine-startup which fixes above
issue and the stupidity in my original script.

Have fun.

Osamu
-- 
~\^o^/~~~ ~\^.^/~~~ ~\^*^/~~~ ~\^_^/~~~ ~\^+^/~~~ ~\^:^/~~~ ~\^v^/~~~ +++++
        Osamu Aoki <osamu@debian.org>   Cupertino CA USA, GPG-key: A8061F32
 .''`.  Debian Reference: post-installation user's guide for non-developers
 : :' : http://qref.sf.net and http://people.debian.org/~osamu
 `. `'  "Our Priorities are Our Users and Free Software" --- Social Contract

# just to be safe
unset REALSTARTUP

if grep -qs ^allow-user-xsession "$OPTIONFILE"; then
  for STARTUPFILE in "$STARTUP" "$ALTSTARTUP"; do
    if [ -e "$STARTUPFILE" ]; then
      if [ -x "$STARTUPFILE" ]; then
        REALSTARTUP=$STARTUPFILE
      else
        REALSTARTUP="sh $STARTUPFILE"
      fi
      break
    fi
  done
fi

# Works even if alternative system is broken. :-)
# also now you can install X session manager and you can choose to
# use X window manager as default for everyone.
if [ -z "$REALSTARTUP" ]; then
  if [ -x /usr/bin/x-session-manager ] && \
       ! grep -qs ^do-not-use-x-session-manager "$OPTIONFILE"; then
      REALSTARTUP=/usr/bin/x-session-manager
  elif [ -x /usr/bin/x-window-manager ] && \
       ! grep -qs ^do-not-use-x-window-manager "$OPTIONFILE"; then
      REALSTARTUP=/usr/bin/x-window-manager
  elif [ -x /usr/bin/X11/twm ] && \
       ! grep -qs ^do-not-use-x-window-manager "$OPTIONFILE"; then
      REALSTARTUP=/usr/bin/X11/twm
  elif [ -x /usr/bin/x-terminal-emulator ]; then
    REALSTARTUP=/usr/bin/x-terminal-emulator
  elif [ -x /usr/bin/X11/xterm ]; then
    REALSTARTUP=/usr/bin/X11/xterm
  fi
fi

if [ -z "$REALSTARTUP" ]; then
  # fatal error
  ERRMSG="Xsession: unable to start X session; "
  if grep -qs ^allow-user-xsession "$OPTIONFILE"; then
    ERRMSG="$ERRMSG no $STARTUP file, no $ALTSTARTUP file,"
  fi
  errormsg "$ERRMSG no session managers, no window managers, and no terminal" \
           "emulators found.  Aborting."
fi