diff options
| author | Matthias Dienstbier <mdienstbier@googlemail.com> | 2009-07-21 10:42:02 +0200 |
|---|---|---|
| committer | Dieter Plaetinck <dieter@plaetinck.be> | 2009-07-21 10:42:02 +0200 |
| commit | f8668b64c025dd2899d4b98f3a369b716dd30aa9 (patch) | |
| tree | d31d4f85525de927a8b26a3c83db4af624f5bff2 /src/core/libs/lib-ui.sh | |
| parent | 77f5f91892fb9cc98f321206230f321e6a057727 (diff) | |
fix the dead cancel buttons of some menus
Diffstat (limited to 'src/core/libs/lib-ui.sh')
| -rw-r--r-- | src/core/libs/lib-ui.sh | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/src/core/libs/lib-ui.sh b/src/core/libs/lib-ui.sh index 82d11f3..2f49304 100644 --- a/src/core/libs/lib-ui.sh +++ b/src/core/libs/lib-ui.sh @@ -169,16 +169,15 @@ ask_timezone () REGIONS="$REGIONS $i -" done while true; do - ask_option no "Please select a region" '' required $REGIONS + ask_option no "Please select a region" '' required $REGIONS || return 1 region=$ANSWER_OPTION - if [ $? -eq 0 ]; then - ZONES="" - for i in $(grep '^[A-Z]' /usr/share/zoneinfo/zone.tab | grep $region/ | cut -f 3 | sed -e "s#$region/##g"| sort -u); do - ZONES="$ZONES $i -" - done - ask_option no "Please select a timezone" '' required $ZONES - zone=$ANSWER_OPTION - [ $? -eq 0 ] && ANSWER_TIMEZONE="$region/$zone" && return + ZONES="" + for i in $(grep '^[A-Z]' /usr/share/zoneinfo/zone.tab | grep $region/ | cut -f 3 | sed -e "s#$region/##g"| sort -u); do + ZONES="$ZONES $i -" + done + ask_option no "Please select a timezone" '' required $ZONES || return 1 + zone=$ANSWER_OPTION + ANSWER_TIMEZONE="$region/$zone" && return fi done } |