From bda151df1659f3c706385b2b8455c6ab44a1a9e3 Mon Sep 17 00:00:00 2001
From: James Meyer <james.meyer@operamail.com>
Date: Thu, 23 Aug 2012 10:27:45 -0500
Subject: LinHES-config/LinHES-system:  set_windowmanager.sh  rename
 mythvantage style to enhanced. add checks to set_windowmanager to check that
 the wm is valid and that the style is valid

---
 abs/core/LinHES-config/PKGBUILD             |   2 +-
 abs/core/LinHES-config/mv_supplemental.py   |   2 +-
 abs/core/LinHES-system/PKGBUILD             |   2 +-
 abs/core/LinHES-system/set_windowmanager.sh | 114 ++++++++++++++++++----------
 4 files changed, 75 insertions(+), 45 deletions(-)

diff --git a/abs/core/LinHES-config/PKGBUILD b/abs/core/LinHES-config/PKGBUILD
index 97b4913..d395bbc 100644
--- a/abs/core/LinHES-config/PKGBUILD
+++ b/abs/core/LinHES-config/PKGBUILD
@@ -151,7 +151,7 @@ md5sums=('0b29bb0819aad086f612699815132ec5'
          'ecb52b9b7a9ac0c8988093c1dfdda635'
          '23d0e12b7ca1cc6ea6b993c1d7ff20b9'
          '6924cdcc5e7ed0c073b669362b0366e1'
-         '755c05b833aca6c5be130972af052e8b'
+         '919909f4d23b9ee3caf71193c042cc40'
          '5cdb3ef03d5a2a99889a458a82228ecc'
          '2596460462cf6c889cf8f95485537b20'
          'a63ff9ef5250965aeabc74bfa8e43981'
diff --git a/abs/core/LinHES-config/mv_supplemental.py b/abs/core/LinHES-config/mv_supplemental.py
index e25465e..608e997 100644
--- a/abs/core/LinHES-config/mv_supplemental.py
+++ b/abs/core/LinHES-config/mv_supplemental.py
@@ -20,7 +20,7 @@ def windowmanager(systemconfig):
         style = ""
 
     if style == "1" and windowmanager != "default" :
-        style = "mythvantage"
+        style = "enhanced"
     else:
         style = ""
 
diff --git a/abs/core/LinHES-system/PKGBUILD b/abs/core/LinHES-system/PKGBUILD
index 7db67e1..b0a52db 100755
--- a/abs/core/LinHES-system/PKGBUILD
+++ b/abs/core/LinHES-system/PKGBUILD
@@ -67,7 +67,7 @@ md5sums=('e3838fc12af7aaa8e738683b1034b43c'
          'dc0be354ce77ba2b89868fc29b942c43'
          '542e670e78d117657f93141e9689f54d'
          '48b763dba127aac6ab05c84643f83b71'
-         'ba351b92e69bcaf26a9bf80417b09c3c'
+         '148d108b5dd4bb6ae03fcd8b95834e17'
          '294e54209538018008323d164ce39fb3'
          '962a3e9eaba2d1466251b7ab0956705d'
          'd03aedeeeda0f5e9c1eb437411c88477'
diff --git a/abs/core/LinHES-system/set_windowmanager.sh b/abs/core/LinHES-system/set_windowmanager.sh
index 3d0cdb2..105a1e6 100644
--- a/abs/core/LinHES-system/set_windowmanager.sh
+++ b/abs/core/LinHES-system/set_windowmanager.sh
@@ -16,6 +16,64 @@ function stylemsg(){
     echo "Startup path will use $1 style"
     }
 
+function set_wm(){
+    case ${windowmanager} in
+
+        default)
+            outmsg "default/fluxbox"
+            outline="fluxbox"
+            echo "" > /etc/X11/WINDOWMANAGER
+            exit 0
+            ;;
+
+        enlightenment)
+            outmsg "enlightenment"
+            outline="e16 -P /data/e16_config_dir/"
+            ;;
+
+        windowmaker)
+            outmsg "window maker"
+            outline_2="export GNUSTEP_USER_ROOT=/data/GNUstep"
+            outline="wmaker"
+            ;;
+
+        *)
+            outline=$windowmanager
+            outmsg "$outline"
+            ;;
+
+    esac
+
+
+
+    case ${style} in
+
+        enhanced)
+            STYLE="enhanced"
+            stylemsg enhanced
+            ;;
+
+        *)
+            if [ x$style != x ]
+            then
+               stylemsg "** Unknown style..using default"
+               STYLE=""
+            else
+               STYLE="$style"
+               stylemsg "Default"
+            fi
+
+            ;;
+    esac
+
+    echo WM=\"${outline}\" > /etc/X11/WINDOWMANAGER
+    echo "STARTUP_STYLE=$STYLE" >>  /etc/X11/WINDOWMANAGER
+    echo ${outline_2}  >>  /etc/X11/WINDOWMANAGER
+
+
+    }
+
+
 if [ x$windowmanager = x ]
 then
     echo
@@ -31,12 +89,12 @@ then
     echo
     echo "Valid STARTUP_STYLE options are:"
     echo "      default"
-    echo "      mythvantage"
+    echo "      enhanced"
     echo
     echo "If STARTUP_STYLE is not given, then the default will be used."
     echo
     echo "Example:    "
-    echo "    set_windowmanager.sh  enlightenment mythvantage"
+    echo "    set_windowmanager.sh  enlightenment enhanced"
     echo
     echo " "
     echo "if using enlightenment or windowmaker, please ensure that the alt_wm group is installed"
@@ -45,55 +103,27 @@ then
     exit 0
 fi
 
+set_wm
 
-case ${windowmanager} in
-
-    default)
-        outmsg "default/fluxbox"
-        outline="fluxbox"
-        echo "" > /etc/X11/WINDOWMANAGER
-        exit 0
-        ;;
-
-    enlightenment)
-        outmsg "enlightenment"
-        outline="e16 -P /data/e16_config_dir/"
-        ;;
-
-    windowmaker)
-        outmsg "window maker"
-	outline_2="export GNUSTEP_USER_ROOT=/data/GNUstep"
-
-        outline="wmaker"
-        ;;
-
-    *)
-        outline=$windowmanager
-        outmsg "$outline"
-        ;;
-
-esac
+WM_CHECK=`echo $outline|cut -d" " -f1 |tr -dc '[:alnum:]'`
+which $WM_CHECK 2>/dev/null
+rc=$?
+if [ $rc != 0 ]
+then
+    echo "  ***Window manager $WM_CHECK does not look like it is present"
+    echo "  ***setting windowmanger to windowmaker"
+    echo "   "
+    windowmanager="windowmaker"
+    set_wm
+fi
 
 
 
-case ${style} in
 
-    mythvantage)
 
-        STYLE="mythvantage"
-        stylemsg MythVantage
-        ;;
-    *)
-        STYLE="$style"
-        stylemsg "Default"
-        ;;
 
-esac
 
 
-echo WM=\"${outline}\" > /etc/X11/WINDOWMANAGER
-echo "STARTUP_STYLE=$STYLE" >>  /etc/X11/WINDOWMANAGER
-echo ${outline_2}  >>  /etc/X11/WINDOWMANAGER
 
 
 
-- 
cgit v0.12

