X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=recipes%2Fpandora-system%2Fpandora-scripts%2Fop_startupmanager.sh;h=dafede224e0a70d02b2a8410a2ac67bcaddb5f0a;hb=HEAD;hp=7c0c3362cf06d88239360febebecb17a6bf44dca;hpb=ed9a9b80ae92acb9f8b86e0ffa1d4fb4b619d2c3;p=openpandora.oe.git

diff --git a/recipes/pandora-system/pandora-scripts/op_startupmanager.sh b/recipes/pandora-system/pandora-scripts/op_startupmanager.sh
index 7c0c336..dafede2 100755
--- a/recipes/pandora-system/pandora-scripts/op_startupmanager.sh
+++ b/recipes/pandora-system/pandora-scripts/op_startupmanager.sh
@@ -1,16 +1,19 @@
 #!/bin/bash
 # Released under the GPL
-# Startup-Manager, v1.0, written by Michael Mrozek aka EvilDragon 2010 with some help by vimacs.
+# Startup-Manager, v1.1, written by Michael Mrozek aka EvilDragon 2010 with some help by vimacs.
 # This scripts allows you to change various settings of the Pandora startup process.
 
-while mainsel=$(zenity --title="Startup manager" --width="400" --height="250" --list --column "id" --column "Please select" --hide-column=1 --text="What do you want to do?" "gui" "Change Default GUI for current user" "login" "Enable/Disable auto login" "user" "Select default user" "wifi" "Enable/Disable WiFi on boot"); do
+. /usr/pandora/scripts/op_common.sh
+user2=$(get_user)
+user2_home=$(get_user_home)
+
+while mainsel=$(zenity --title="Startup manager" --width="400" --height="310" --list --column "id" --column "Please select" --hide-column=1 --text="Welcome to the Startup Settings\n\nHere you can change the default boot-up behaviour of your Pandora.\n\nWhat do you want to do?\n" "gui" "Change Default GUI for current user" "login" "Enable/Disable auto login" "user" "Select default user" "service" "Enable/Disable services on boot" --ok-label="Change Setting" --cancel-label="Exit"); do
 
 
 case $mainsel in
 
 # Change default GUI
   "gui")
-    user2=$(cat /tmp/currentuser)
     selection=$(cat /etc/pandora/conf/gui.conf | awk -F\; '{print $1 "\n" $2 }' | zenity ---width=500 --height=300 --title="Change the default GUI" --list --column "Name" --column "Description" --text "Please select the GUI you want to run as default startup" )
 
     echo $selection
@@ -18,7 +21,7 @@ case $mainsel in
     gui=$(grep $selection /etc/pandora/conf/gui.conf | awk -F\; '{print $3}')
 
     if [ $gui ]; then 
-      sed -i "s/.*DEFAULT_SESSION=.*/DEFAULT_SESSION=$gui/g" /home/$user2/.xinitrc
+      sed -i "s/.*DEFAULT_SESSION=.*/DEFAULT_SESSION=$gui/g" $user2_home/.xinitrc
       zenity --info --title="Changed session" --text "The default session has been changed to $selection." --timeout 6
     fi;;
 
@@ -43,16 +46,27 @@ case $mainsel in
         zenity --info --title="Changed default user" --text "The default user disabled" --timeout 6
        fi;;
 
-# Enable / Disable WiFi on boot
-     "wifi")
-      if zenity --question --title="Start WiFi on Bootup" --text="Do you wish to automatically start the WiFi driver on bootup?" --ok-label="Yes" --cancel-label="No"; then      	
-	 ln -s ../init.d/wl1251-init /etc/rc5.d/S30wl1251-init
-	 ln -s ../init.d/wl1251-init /etc/rc2.d/S30wl1251-init
-	 zenity --info --title="Changed WiFi startup" --text "WiFi on boot is now enabled." --timeout 6
-      else
-	 rm /etc/rc2.d/S30wl1251-init
-         rm /etc/rc5.d/S30wl1251-init
-         zenity --info --title="Changed WiFi startup" --text "WiFi on boot is now disabled." --timeout 6
-      fi;;
+# Enable / Disable services on boot
+      
+     "service")
+        while servsel=$((
+		cat /etc/pandora/conf/service.conf|awk -F\# '{
+		if (system("test -f "$1))
+		    print "FALSE"
+		else
+		    print "TRUE";print NR;print $2
+		}'
+		)|
+		zenity --title='Service Manager' --width=500 --height=300 --list --checklist --hide-column=2 --column Enabled --column line --column 'Please select'  --text='Enable / Disable Service:' --separator='#'); do
+
+	cat /etc/pandora/conf/service.conf|awk -F\# -v pat="$servsel" '{
+	if (match(pat,NR))
+	    system ($4)
+	else
+	    system ($3)
+	}'
+	zenity --info --title="Done" --text "The startup services have been changed." --timeout 6
+	done
+;;
 esac
-done 
\ No newline at end of file
+done