summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Makefile2
-rwxr-xr-xsesman/startwm.sh18
2 files changed, 12 insertions, 8 deletions
diff --git a/Makefile b/Makefile
index fa354be9..193994d4 100644
--- a/Makefile
+++ b/Makefile
@@ -51,7 +51,7 @@ install:
install instfiles/xrdp_control.sh $(DESTDIR)/xrdp_control.sh
installdeb:
- mkdir -p $(DESTDIRDEB)/usr/xrdp
+ mkdir -p $(DESTDIRDEB)/usr/lib/xrdp
mkdir -p $(DESTDIRDEB)/etc/xrdp
mkdir -p $(DESTDIRDEB)/etc/pam.d
mkdir -p $(DESTDIRDEB)/etc/init.d
diff --git a/sesman/startwm.sh b/sesman/startwm.sh
index 459b4dc9..3445c494 100755
--- a/sesman/startwm.sh
+++ b/sesman/startwm.sh
@@ -10,20 +10,23 @@ fi
if [ -d /opt/kde/bin ]; then
export PATH=/opt/kde/bin:$PATH
fi
-if [ "'which startkde'" != "" ]; then
+which startkde
+if [ $? -eq 0 ]; then
startkde
exit 0
fi
-if [ "'which kde'" != "" ]; then
+which kde
+if [ $? -eq 0 ]; then
kde
exit 0
fi
# gnome
-#if [ "'which gnome-session'" != "" ]; then
-# gnome-session
-# exit 0
-#fi
+which gnome-session
+if [ $? -eq 0 ]; then
+ gnome-session
+ exit 0
+fi
# blackbox
#if [ "'which blackbox'" != "" ]; then
@@ -38,7 +41,8 @@ fi
#fi
# fall back on xterm
-if [ "'which xterm'" != "" ]; then
+which xterm
+if [ $? -eq 0 ]; then
xterm
exit 0
fi