From 79c5f3e44b95af4f5959a54c11c2e70b76623c58 Mon Sep 17 00:00:00 2001 From: David-John Willis Date: Tue, 16 Mar 2010 11:06:44 +0000 Subject: [PATCH] pandora-first-run-wizard: Add MiniMenu to the GUI selections. --- recipes/pandora-system/pandora-first-run-wizard.bb | 2 +- .../pandora-first-run-wizard/first-run-wizard.sh | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/recipes/pandora-system/pandora-first-run-wizard.bb b/recipes/pandora-system/pandora-first-run-wizard.bb index b26dce4..2781196 100755 --- a/recipes/pandora-system/pandora-first-run-wizard.bb +++ b/recipes/pandora-system/pandora-first-run-wizard.bb @@ -6,7 +6,7 @@ RDEPENDS = "hsetroot zenity dbus pandora-wallpaper-official tslib tslib-calibrat COMPATIBLE_MACHINE = "omap3-pandora" -PR = "r10" +PR = "r11" SRC_URI = " \ file://first-run-wizard.sh \ diff --git a/recipes/pandora-system/pandora-first-run-wizard/first-run-wizard.sh b/recipes/pandora-system/pandora-first-run-wizard/first-run-wizard.sh index 61f28a3..3d78b79 100644 --- a/recipes/pandora-system/pandora-first-run-wizard/first-run-wizard.sh +++ b/recipes/pandora-system/pandora-first-run-wizard/first-run-wizard.sh @@ -147,7 +147,7 @@ fi # Select the default interface and setup SLiM to pass that as a sesion to ~./.xinitrc -while ! launcher=$(zenity --height 250 --list --title="Default User Interface" --text="Please choose your default application launcher.\n\nYou can always change this setting later." --column "return" --print-column=1 --hide-column=1 --column "Pick a launcher" "xfce" "Desktop environment (Xfce)" "pmenu" "Gaming-console like launcher (PMenu)" "netbooklauncher" "Netbook Launcher") || [ "x$launcher" = "x" ]; do +while ! launcher=$(zenity --height 260 --list --title="Default User Interface" --text="Please choose your default application launcher.\n\nYou can always change this setting later." --column "return" --print-column=1 --hide-column=1 --column "Pick a launcher" "xfce" "Desktop environment (Xfce)" "mmenu" "Very basic GUI (MiniMenu)" "pmenu" "Gaming-console like launcher (PMenu)" "netbooklauncher" "Netbook Launcher") || [ "x$launcher" = "x" ]; do zenity --title="Error" --error --text="Please select a default launcher." --timeout 6 done @@ -161,6 +161,8 @@ elif [ $launcher == "pmenu" ]; then echo PMenu selected as default interface elif [ $launcher == "netbooklauncher" ]; then sed -i 's/.*DEFAULT_SESSION=.*/DEFAULT_SESSION=startnetbooklauncher/g' /home/$username/.xinitrc +elif [ $launcher == "mmenu" ]; then + sed -i 's/.*DEFAULT_SESSION=.*/DEFAULT_SESSION=startmmenu/g' /home/$username/.xinitrc fi # ---- -- 2.39.2