From aa50f22312798d94ad1f94a0d829831bf603ad3b Mon Sep 17 00:00:00 2001
From: human <human@neet.fi>
Date: Sun, 28 Apr 2019 14:26:27 +0300
Subject: [PATCH] installer: better timezone menu

Closes: #65 [via git-merge-pr]
---
 installer.sh.in | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/installer.sh.in b/installer.sh.in
index 17ec46e..c007316 100644
--- a/installer.sh.in
+++ b/installer.sh.in
@@ -577,22 +577,22 @@ set_locale() {
 }
 
 menu_timezone() {
-    local _tzones="$(cd /usr/share/zoneinfo; find Africa/ America/ Antarctica/ Arctic/ Asia/ Atlantic/ Australia/ Europe/ Indian/ Pacific/ posix/ -type f | sort)"
-    local _TIMEZONES=
+    local areas=(Africa America Antarctica Arctic Asia Atlantic Australia Europe Indian Pacific)
 
-    for f in ${_tzones}; do
-        _TIMEZONES="${_TIMEZONES} ${f} -"
-    done
-    while true; do
-        DIALOG --title " Select your timezone " --menu "$MENULABEL" 14 70 14 ${_TIMEZONES}
-        if [ $? -eq 0 ]; then
-            set_option TIMEZONE "$(cat $ANSWER)"
+    local area locations location
+    while (IFS='|'; DIALOG ${area:+--default-item|"$area"} --title " Select area " --menu "$MENULABEL" 19 51 19 $(printf '%s||' "${areas[@]}")); do
+        area=$(cat $ANSWER)
+        read -a locations -d '\n' < <(find /usr/share/zoneinfo/$area -type f -printf '%P\n' | sort)
+        if (IFS='|'; DIALOG --title " Select location (${area}) " --menu "$MENULABEL" 19 51 19 $(printf '%s||' "${locations[@]//_/ }")); then
+            location=$(tr ' ' '_' < $ANSWER)
+            set_option TIMEZONE "$area/$location"
             TIMEZONE_DONE=1
-            break
+            return 0
         else
-            return
+            continue
         fi
     done
+    return 1
 }
 
 set_timezone() {