Merge branch 'HEAD' of ssh://cesman@knoppmyth.net/mount/repository/LinHES-PKGBUILD

1 files changed, 46 insertions, 32 deletions

diff --git a/abs/core-testing/LinHES-config/systemconfig.sh b/abs/core-testing/LinHES-config/systemconfig.sh
index 4fdbea0..6d63f5c 100755
--- a/abs/core-testing/LinHES-config/systemconfig.sh
+++ b/abs/core-testing/LinHES-config/systemconfig.sh
@@ -424,8 +424,9 @@ do
     fi
 done
 #everything else
-for i in  miro xe romdb xine dvdcss
+for i in  miro xe romdb xine dvdcss webmin
 do
+    eval pkgvalue=\$${i}
     case $i in
         xine)
                 if [ x$pkgvalue = x1 ]
@@ -443,6 +444,17 @@ do
                     pkglistremove="$pkglistremove libdvdcss"
                 fi
             ;;
+        webmin)
+                ##Daemon_add is here because webmin is on the software page instead of the advanced screen
+                if [ x$pkgvalue = x1 ]
+                then
+                    pkglistinstall="$pkglistinstall webmin"
+                    daemon_add="webmin $daemon_add"
+                else
+                    pkglistremove="$pkglistremove webmin"
+                    daemon_remove="webmin $daemon_remove"
+                fi
+                ;;
         *)
             if [ x$pkgvalue = x1 ]
             then
@@ -700,10 +712,10 @@ if [ x$Runncidd = x1 ]
 then
            ser_daemon_add="ncidd ncid $ser_daemon_add"
            ser_install="ncid $ser_install"
-  else
+else
            ser_daemon_remove="ncidd ncid $ser_daemon_remove"
            ser_remove="ncid $ser_remove"
- fi
+fi
 
 
 if [ x$UseEvrouter = x1 ]
@@ -713,6 +725,9 @@ then
            ser_remove="evrouter $ser_remove"
 fi
 
+
+
+
 #Setting the default, just to avoid the or statement..
 #if [ x$UseHobbit = x ]
 #then
@@ -1060,41 +1075,40 @@ hosttypechange="false"
 
 
 for i in  $LIST
-  do
-   echo $i
-   case $i in
-	   misc) showmisc="true"
-	   	;;
-	  sleep) showsleep="true"
-		;;
-	  hostype) showhost="true"
-                      showX="true"
-	  	;;
-         hostypec) hosttypechange="true"
-                ;;
-	 advanced) showadvanced="true"
-                      #showhost="true"
-		;;
-	audio) showaudio="true"
-		;;
-	network) shownetwork="true"
-		;;
+do
+echo $i
+case $i in
+    misc) showmisc="true"
+        ;;
+    sleep) showsleep="true"
+        ;;
+    hostype) showhost="true"
+             showX="true"
+        ;;
+    hostypec) hosttypechange="true"
+            ;;
+    advanced) showadvanced="true"
+        ;;
+    audio) showaudio="true"
+        ;;
+    network) shownetwork="true"
+        ;;
     advancedX)  showX="true"
-      ;;
-      webuser)  setup_web_auth
-      ;;
+        ;;
+    webuser)  setup_web_auth
+        ;;
     restartfe)  killall -9 mythfrontend
-                    killall -9 mythwelcome
-                    exit 0
-    ;;
+                killall -9 mythwelcome
+                 exit 0
+        ;;
     reloadfe)  reloadfe
-            ;;
+        ;;
 
     this_is_install) MV_NEW_INSTALL="true"
-		;;
+        ;;
 
-	esac
-  done
+    esac
+done
 
 if [ x$MV_NEW_INSTALL = xtrue ]
 then