From: Michael Mrozek Date: Thu, 5 Aug 2010 23:01:43 +0000 (+0200) Subject: op_datetime and pandora-first-run-wizard: Fixed problem that calendar didn't appear... X-Git-Tag: sz_beta3~235^2~29 X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?p=openpandora.oe.git;a=commitdiff_plain;h=30dd378df8c729bb7ee8a77c3f05bbcd65e34826;hp=bb8bf459c16ff1c4228ade712afdb1f4c855693c op_datetime and pandora-first-run-wizard: Fixed problem that calendar didn't appear when Month was 0 (thanks to tsh for the patch) --- diff --git a/recipes/pandora-system/pandora-first-run-wizard.bb b/recipes/pandora-system/pandora-first-run-wizard.bb index 38b76aa..928a4ca 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 = "r18" +PR = "r19" 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 48a922f..327f817 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 @@ -185,7 +185,7 @@ echo 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` +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.bb b/recipes/pandora-system/pandora-scripts.bb index 03c9b41..af460c8 100644 --- a/recipes/pandora-system/pandora-scripts.bb +++ b/recipes/pandora-system/pandora-scripts.bb @@ -6,7 +6,7 @@ COMPATIBLE_MACHINE = "omap3-pandora" DEPENDS = "zenity dbus" RDEPENDS = "zenity dbus" -PR = "r37" +PR = "r38" SRC_URI = " \ file://op_bright.sh \ diff --git a/recipes/pandora-system/pandora-scripts/op_datetime.sh b/recipes/pandora-system/pandora-scripts/op_datetime.sh index fd178be..654cc17 100755 --- a/recipes/pandora-system/pandora-scripts/op_datetime.sh +++ b/recipes/pandora-system/pandora-scripts/op_datetime.sh @@ -11,7 +11,7 @@ echo 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` +date_m=`date +%m`| sed 's/^0//'` date_y=`date +%Y`