From: Michael Mrozek <EvilDragon@openpandora.de>
Date: Mon, 9 Aug 2010 09:30:51 +0000 (+0200)
Subject: pandora-scripts / first-run-wizard: Fixed two date setting bugs
X-Git-Tag: sz_beta3~235^2~28
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=11ce35553827db7113983188b70deba97ab3386b;p=openpandora.oe.git

pandora-scripts / first-run-wizard: Fixed two date setting bugs
service.conf: Fixed a typo
---

diff --git a/recipes/pandora-system/pandora-first-run-wizard.bb b/recipes/pandora-system/pandora-first-run-wizard.bb
index 928a4ca..267568e 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 = "r19"
+PR = "r20"
 
 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 327f817..3d93cb2 100755
--- a/recipes/pandora-system/pandora-first-run-wizard/first-run-wizard.sh
+++ b/recipes/pandora-system/pandora-first-run-wizard/first-run-wizard.sh
@@ -181,11 +181,11 @@ while ! timezone=$(zenity --list --title "Select your timezone" --text="Please s
 done
 timezone=`echo $timezone | sed  's/(.*)//g'`
 echo $timezone
-echo rm /etc/localtime && ln -s /usr/share/zoneinfo/Etc/$timezone /etc/localtime
+rm /etc/localtime && ln -s /usr/share/zoneinfo/Etc/$timezone /etc/localtime
 
 #Make sure we clean up any leading zeros in the day (as Zenity freaks out)
 date_d=`date +%d | sed 's/^0//'`
-date_m=`date +%m`| sed 's/^0//'`
+date_m=`date +%m | sed 's/^0//'`
 date_y=`date +%Y`
 
 while ! date=$(zenity --calendar --text="Please select the current date" --title "Please select the current date" --day=$date_d --month=$date_m --year=$date_y --date-format="%Y%m%d" --width=500) || [ "x$date" = "x" ] ; do
diff --git a/recipes/pandora-system/pandora-scripts/op_datetime.sh b/recipes/pandora-system/pandora-scripts/op_datetime.sh
index 654cc17..538cb08 100755
--- a/recipes/pandora-system/pandora-scripts/op_datetime.sh
+++ b/recipes/pandora-system/pandora-scripts/op_datetime.sh
@@ -7,11 +7,11 @@ while ! timezone=$(zenity --list --title "Select your time zone" --text="Please
 done
 timezone=`echo $timezone | sed  's/(.*)//g'`
 echo $timezone
-echo rm /etc/localtime && ln -s /usr/share/zoneinfo/Etc/$timezone /etc/localtime
+rm /etc/localtime && ln -s /usr/share/zoneinfo/Etc/$timezone /etc/localtime
 
 #Make sure we clean up any leading zeros in the day (as Zenity freaks out)
 date_d=`date +%d | sed 's/^0//'`
-date_m=`date +%m`| sed 's/^0//'`
+date_m=`date +%m | sed 's/^0//'`
 date_y=`date +%Y`
 
 
diff --git a/recipes/pandora-system/pandora-scripts/service.conf b/recipes/pandora-system/pandora-scripts/service.conf
index c3cc2a6..abf236c 100644
--- a/recipes/pandora-system/pandora-scripts/service.conf
+++ b/recipes/pandora-system/pandora-scripts/service.conf
@@ -2,5 +2,5 @@
 /etc/rc5.d/S30wl1251-init#Start Wifi on bootup#update-rc.d -f wl1251-init remove#update-rc.d -f wl1251-init defaults 30 40
 /etc/rc5.d/S10dropbear#Start Dropbear (SSH login) on bootup#update-rc.d -f dropbear remove#update-rc.d -f dropbear defaults 10
 /etc/rcS.d/S39alsa-state#Save/Restore ALSA Mixer Settings#update-rc.d -f alsa-state remove#update-rc.d -f alsa-state start 39 S . stop 31 0 1 6 .
-/etc/rc5.d/S45mountnfs.sh#Mount remote filesystems on bootup#update-rc.d -f mountnfs.sh remove;update-rc.d -f umountnfs.sh remove#update-rc.d -f mountnfs.sh start 45 S . ;update-rc.d -f umountnfs.sh start 31 0 6 .
+/etc/rcS.d/S45mountnfs.sh#Mount remote filesystems on bootup#update-rc.d -f mountnfs.sh remove;update-rc.d -f umountnfs.sh remove#update-rc.d -f mountnfs.sh start 45 S . ;update-rc.d -f umountnfs.sh start 31 0 6 .
 /etc/rc5.d/S50usb-gadget#Start USB Network on bootup#update-rc.d -f usb-gadget remove#update-rc.d -f usb-gadget defaults 50
\ No newline at end of file