op_switchgui.sh: Added NOSWITCH parsing (entries with NOSWITCH set in gui.conf don...

gui.conf: Added SwitchGUI as new GUI (shows GUI selector on bootup).

diff --git a/recipes/pandora-system/pandora-scripts/gui.conf b/recipes/pandora-system/pandora-scripts/gui.conf
index 6986266..2bb9f72 100644 (file)
--- a/recipes/pandora-system/pandora-scripts/gui.conf
+++ b/recipes/pandora-system/pandora-scripts/gui.conf
@@ -1,2 +1,3 @@
 XFCE4;The full desktop Environment;startxfce4;xfce4-session-logout --logout
 MiniMenu;A very simple but flexible menu;startmmenu;stopmmenu
 XFCE4;The full desktop Environment;startxfce4;xfce4-session-logout --logout
 MiniMenu;A very simple but flexible menu;startmmenu;stopmmenu

+GUISwitch;Select your GUI on bootup;\/usr\/pandora\/scripts\/op_switchgui.sh;;NOSWITCH
\ No newline at end of file

diff --git a/recipes/pandora-system/pandora-scripts/op_switchgui.sh b/recipes/pandora-system/pandora-scripts/op_switchgui.sh
index d401cd4..27eb61f 100755 (executable)
--- a/recipes/pandora-system/pandora-scripts/op_switchgui.sh
+++ b/recipes/pandora-system/pandora-scripts/op_switchgui.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
 #!/bin/bash
 

-selection=$(cat /etc/pandora/conf/gui.conf | awk -F\; '{print $1 "\n" $2 }' | zenity --width=500 --height=300 --title="Switch to a different GUI" --list --column "name" --column "description" --text "Select a GUI you want to switch to" )
+selection=$(cat /etc/pandora/conf/gui.conf | grep -v NOSWITCH | awk -F\; '{print $1 "\n" $2 }' | zenity --width=500 --height=300 --title="Switch to a different GUI" --list --column "name" --column "description" --text "Select a GUI you want to switch to" )

 echo $selection
 
 gui=$(grep $selection /etc/pandora/conf/gui.conf | awk -F\; '{print $3}')
 echo $selection
 
 gui=$(grep $selection /etc/pandora/conf/gui.conf | awk -F\; '{print $3}')