xstefen/al-installer
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Preserve choices made for early setup for additional runs

Browse Source
This commit is contained in:
natemaia 2020-05-14 21:06:50 -07:00
parent b7e6c053e1
commit e6f3e606bd
1 changed files with 40 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
archlabs-installer
View File

@ -7,7 +7,7 @@
# shellcheck disable=SC2086,SC2046,SC2254,SC2164 # shellcheck disable=SC2086,SC2046,SC2254,SC2164
VER=2.1.49 VER=2.1.50
# default values { # default values {
@ -625,32 +625,43 @@ select_mkuser()
select_keymap() select_keymap()
{ {
dlg KEYMAP menu "Keyboard" "$_keymap" \ if [[ ! -f /tmp/xkeys ]]; then
us English cm English gb English au English gh English \ dlg KEYMAP menu "Keyboard" "$_keymap" \
za English ng English ca French 'cd' French gn French \ us English cm English gb English au English gh English \
tg French fr French de German at German ch German \ za English ng English ca French 'cd' French gn French \
es Spanish latam Spanish br Portuguese pt Portuguese ma Arabic \ tg French fr French de German at German ch German \
sy Arabic ara Arabic ua Ukrainian cz Czech ru Russian \ es Spanish latam Spanish br Portuguese pt Portuguese ma Arabic \
sk Slovak nl Dutch it Italian hu Hungarian cn Chinese \ sy Arabic ara Arabic ua Ukrainian cz Czech ru Russian \
tw Taiwanese vn Vietnamese kr Korean jp Japanese th Thai \ sk Slovak nl Dutch it Italian hu Hungarian cn Chinese \
la Lao pl Polish se Swedish is Icelandic 'fi' Finnish \ tw Taiwanese vn Vietnamese kr Korean jp Japanese th Thai \
dk Danish be Belgian in Indian al Albanian am Armenian \ la Lao pl Polish se Swedish is Icelandic 'fi' Finnish \
bd Bangla ba Bosnian 'bg' Bulgarian dz Berber mm Burmese \ dk Danish be Belgian in Indian al Albanian am Armenian \
hr Croatian gr Greek il Hebrew ir Persian iq Iraqi \ bd Bangla ba Bosnian 'bg' Bulgarian dz Berber mm Burmese \
af Afghani fo Faroese ge Georgian ee Estonian kg Kyrgyz \ hr Croatian gr Greek il Hebrew ir Persian iq Iraqi \
kz Kazakh lt Lithuanian mt Maltese mn Mongolian ro Romanian \ af Afghani fo Faroese ge Georgian ee Estonian kg Kyrgyz \
no Norwegian rs Serbian si Slovenian tj Tajik lk Sinhala \ kz Kazakh lt Lithuanian mt Maltese mn Mongolian ro Romanian \
tr Turkish uz Uzbek ie Irish pk Urdu 'mv' Dhivehi \ no Norwegian rs Serbian si Slovenian tj Tajik lk Sinhala \
np Nepali et Amharic sn Wolof ml Bambara tz Swahili \ tr Turkish uz Uzbek ie Irish pk Urdu 'mv' Dhivehi \
ke Swahili bw Tswana ph Filipino my Malay tm Turkmen \ np Nepali et Amharic sn Wolof ml Bambara tz Swahili \
id Indonesian bt Dzongkha lv Latvian md Moldavian mao Maori \ ke Swahili bw Tswana ph Filipino my Malay tm Turkmen \
by Belarusian az Azerbaijani mk Macedonian kh Khmer epo Esperanto \ id Indonesian bt Dzongkha lv Latvian md Moldavian mao Maori \
me Montenegrin || return 1 by Belarusian az Azerbaijani mk Macedonian kh Khmer epo Esperanto \
me Montenegrin || return 1
if [[ $CMAPS == *"$KEYMAP "* ]]; then echo "$KEYMAP" > /tmp/xkeys
CMAP="$KEYMAP"
else else
dlg CMAP menu "Console Keymap" "$_vconsole" $CMAPS || return 1 KEYMAP="$(< /tmp/xkeys)"
fi
if [[ ! -f /tmp/ckeys ]]; then
if [[ $CMAPS == *"$KEYMAP "* ]]; then
CMAP="$KEYMAP"
else
dlg CMAP menu "Console Keymap" "$_vconsole" $CMAPS || return 1
fi
echo "$CMAP" > /tmp/ckeys
else
CMAP="$(< /tmp/ckeys)"
fi fi
if [[ $TERM == 'linux' ]]; then if [[ $TERM == 'linux' ]]; then
@ -3313,7 +3324,10 @@ else
done done
fi fi
msg "Welcome to the $DIST Installer" "$_welcome" if [[ ! -f /tmp/welcomed ]]; then
msg "Welcome to the $DIST Installer" "$_welcome"
touch /tmp/welcomed
fi
if ! select_keymap; then if ! select_keymap; then
clear clear