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

18
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,6 +625,7 @@ select_mkuser()
select_keymap() select_keymap()
{ {
if [[ ! -f /tmp/xkeys ]]; then
dlg KEYMAP menu "Keyboard" "$_keymap" \ dlg KEYMAP menu "Keyboard" "$_keymap" \
us English cm English gb English au English gh English \ us English cm English gb English au English gh English \
za English ng English ca French 'cd' French gn French \ za English ng English ca French 'cd' French gn French \
@ -647,11 +648,21 @@ select_keymap()
by Belarusian az Azerbaijani mk Macedonian kh Khmer epo Esperanto \ by Belarusian az Azerbaijani mk Macedonian kh Khmer epo Esperanto \
me Montenegrin || return 1 me Montenegrin || return 1
echo "$KEYMAP" > /tmp/xkeys
else
KEYMAP="$(< /tmp/xkeys)"
fi
if [[ ! -f /tmp/ckeys ]]; then
if [[ $CMAPS == *"$KEYMAP "* ]]; then if [[ $CMAPS == *"$KEYMAP "* ]]; then
CMAP="$KEYMAP" CMAP="$KEYMAP"
else else
dlg CMAP menu "Console Keymap" "$_vconsole" $CMAPS || return 1 dlg CMAP menu "Console Keymap" "$_vconsole" $CMAPS || return 1
fi fi
echo "$CMAP" > /tmp/ckeys
else
CMAP="$(< /tmp/ckeys)"
fi
if [[ $TERM == 'linux' ]]; then if [[ $TERM == 'linux' ]]; then
loadkeys "$CMAP" > /dev/null 2>&1 loadkeys "$CMAP" > /dev/null 2>&1
@ -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