From bf26924962050875c60e009cc76b81fabb74e7f3 Mon Sep 17 00:00:00 2001 From: Michael Mrozek Date: Sun, 20 May 2012 13:00:29 +0200 Subject: [PATCH] op_datetime.sh and pandora-first-run-wizard: Removed the warning about the screen turning black, as this should be fixed. --- .../pandora-first-run-wizard/first-run-wizard.sh | 4 ++-- recipes/pandora-system/pandora-scripts/op_datetime.sh | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) 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 36ff0fc..81971e4 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 @@ -203,12 +203,12 @@ echo $date time_h=`date +%H` time_m=`date +%M` -while ! time=$(zenity --title="Enter current time" --entry --text "Please enter the time in 24hour format (HH:MM).\n\nThe screen might blank out after you changed the time.\nDon't panic. Simply press a button on the keyboard.\n" --entry-text "$time_h:$time_m") || [ "x$time" = "x" ] ; do +while ! time=$(zenity --title="Enter current time" --entry --text "Please enter the time in 24hour format (HH:MM).\n" --entry-text "$time_h:$time_m") || [ "x$time" = "x" ] ; do zenity --title="Error" --error --text="Please input the time." --timeout 6 done while ! date -d $time ; do - time=$(zenity --title="Enter current time" --entry --text "Please enter the time in 24hour format (HH:MM).\n\nThe screen might blank out after you changed the time.\nDon't panic. Simply press a button on the keyboard.\n" --entry-text "$time_h:$time_m") + time=$(zenity --title="Enter current time" --entry --text "Please enter the time in 24hour format (HH:MM).\n" --entry-text "$time_h:$time_m") done date +%Y%m%d -s $date diff --git a/recipes/pandora-system/pandora-scripts/op_datetime.sh b/recipes/pandora-system/pandora-scripts/op_datetime.sh index 04aa5ed..09ade72 100755 --- a/recipes/pandora-system/pandora-scripts/op_datetime.sh +++ b/recipes/pandora-system/pandora-scripts/op_datetime.sh @@ -39,7 +39,7 @@ case $mainsel in time_m=`date +%M` while true; do - time=$(zenity --title="Enter actual time" --entry --text "Please enter the time in 24hour format (HH:MM).\n\nThe screen might blank out after you changed the time.\nDon't panic. Simply press a button on the keyboard.\n" --entry-text "$time_h:$time_m") || exit 1 + time=$(zenity --title="Enter actual time" --entry --text "Please enter the time in 24hour format (HH:MM).\n" --entry-text "$time_h:$time_m") || exit 1 if test -n "$time" && date -d "$time"; then break; fi -- 2.39.2