From aefd3808a11439a83c295f1a1cecaff97011c6d5 Mon Sep 17 00:00:00 2001
From: jsorg71 <jsorg71>
Date: Mon, 26 Jul 2010 01:52:12 +0000
Subject: [PATCH] don't use -l

---
 sesman/startwm.sh | 91 +++++++++++++++++++++++++++++++++++++++--------
 1 file changed, 76 insertions(+), 15 deletions(-)

diff --git a/sesman/startwm.sh b/sesman/startwm.sh
index 74850296..16008517 100755
--- a/sesman/startwm.sh
+++ b/sesman/startwm.sh
@@ -1,9 +1,80 @@
-#!/bin/sh -l
+#!/bin/sh
 
 # change the order in line below to run to run whatever window manager you
 # want, default to kde
 
-SESSIONS="startkde gnome-session startxfce4 xterm"
+SESSIONS="gnome-session blackbox startxfce4 startkde xterm"
+
+#start the window manager
+wm_start()
+{
+  for WindowManager in $SESSIONS
+  do
+    which $WindowManager
+    if test $? -eq 0
+    then
+      echo "Starting $WindowManager"
+      $WindowManager
+      return 0
+    fi
+  done
+  return 0
+}
+
+#Execution sequence for interactive login shell
+#Following pseudo code explains the sequence of execution of these files.
+#execute /etc/profile
+#IF ~/.bash_profile exists THEN
+#    execute ~/.bash_profile
+#ELSE
+#    IF ~/.bash_login exist THEN
+#        execute ~/.bash_login
+#    ELSE
+#        IF ~/.profile exist THEN
+#            execute ~/.profile
+#        END IF
+#    END IF
+#END IF
+pre_start()
+{
+  if [ -f /etc/profile ]
+  then
+    . /etc/profile
+  fi
+  if [ -f ~/.bash_profile ]
+  then
+    . ~/.bash_profile
+  else
+    if [ -f ~/.bash_login ]
+    then
+      . ~/.bash_login
+    else
+      if [ -f ~/.profile ]
+      then
+        . ~/.profile
+      fi
+    fi
+  fi
+  return 0
+}
+
+#When you logout of the interactive shell, following is the
+#sequence of execution:
+#IF ~/.bash_logout exists THEN
+#    execute ~/.bash_logout
+#END IF
+post_start()
+{
+  if [ -f ~/.bash_logout ]
+  then
+    . ~/.bash_logout
+  fi
+  return 0
+}
+
+#. /etc/environment
+#export PATH=$PATH
+#export LANG=$LANG
 
 # change PATH to be what your environment needs usually what is in
 # /etc/environment
@@ -14,19 +85,9 @@ SESSIONS="startkde gnome-session startxfce4 xterm"
 # pam will auto process the environment file if /etc/pam.d/xrdp-sesman
 # includes
 # auth       required     pam_env.so readenv=1
-#. /etc/environment
-#export PATH=$PATH
-#export LANG=$LANG
 
-for WindowManager in $SESSIONS
-do
-  which $WindowManager
-  if test $? -eq 0
-  then
-    echo "Starting $WindowManager"
-    $WindowManager
-    exit 0
-  fi
-done
+pre_start
+wm_start
+post_start
 
 exit 1