pandora-first-run-wizard: Disable touchscreen calibration for now as defaults seem...

diff --git a/recipes/pandora-system/pandora-first-run-wizard.bb b/recipes/pandora-system/pandora-first-run-wizard.bb
index d80e02d..ae17abb 100755 (executable)
--- 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 = "r5"
+PR = "r6"
 
 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 32180cb..496e06b 100644 (file)
--- a/recipes/pandora-system/pandora-first-run-wizard/first-run-wizard.sh
+++ b/recipes/pandora-system/pandora-first-run-wizard/first-run-wizard.sh
@@ -45,19 +45,19 @@ fi
 
 # Ask the user to calibrate the touchscreen.
 
-if zenity --question --title="Touchscreen calibration" --text="It is recommended to calibrate and test the device touchscreen.\n\nDo you wish to calibrate the touchscreen now?" --ok-label="Yes" --cancel-label="No"; then 
-       # Make sure we have a sane environment as this script will be run long before any /etc/profile stuff.
-       . /etc/profile.d/tslib.sh
-       # Delete the pointercal file (do we want to do that?)
-       # rm /etc/pointercal
-       # Spawn the ts_* tools as subprocesses that will return to the script.
-       echo Running ts_calibrate       
-       /usr/bin/ts_calibrate
-       wait
-       echo Running ts_test
-       /usr/bin/ts_test
-       wait
-fi
+#if zenity --question --title="Touchscreen calibration" --text="It is recommended to calibrate and test the device touchscreen.\n\nDo you wish to calibrate the touchscreen now?" --ok-label="Yes" --cancel-label="No"; then 
+#      # Make sure we have a sane environment as this script will be run long before any /etc/profile stuff.
+#      . /etc/profile.d/tslib.sh
+#      # Delete the pointercal file (do we want to do that?)
+#      # rm /etc/pointercal
+#      # Spawn the ts_* tools as subprocesses that will return to the script.
+#      echo Running ts_calibrate       
+#      /usr/bin/ts_calibrate
+#      wait
+#      echo Running ts_test
+#      /usr/bin/ts_test
+#      wait
+#fi
 
 # ----
 
@@ -151,10 +151,10 @@ while ! launcher=$(zenity --list --title="Default User Interface" --text="Please
 done
 
 if [ $launcher == "xfce" ]; then 
-       sed -i 's/.*sessions.*/sessions xfce4,pmenu/g' /etc/slim.conf
+       sed -i 's/.*sessions .*/sessions xfce4,pmenu/g' /etc/slim.conf
        echo Xfce selected as default interface
 else
-       sed -i 's/.*sessions.*/sessions pmenu,xfce4/g' /etc/slim.conf
+       sed -i 's/.*sessions .*/sessions pmenu,xfce4/g' /etc/slim.conf
        echo PMenu selected as default interface
 fi