root/archboot
1
0
Fork 0
mirror of https://gitlab.archlinux.org/tpowa/archboot.git synced 2024-09-19 19:40:37 +02:00
Code Issues Projects Releases Packages Wiki Activity

better loops in vconsole

Browse source
This commit is contained in:
Tobias Powalowski 2023-07-14 16:20:37 +02:00
parent 685d8fd44b
commit 53d7977fc8
2 changed files with 13 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
usr/bin/archboot-clock.sh
View file

@ -94,10 +94,10 @@ _timeset() {
# DD/MM/YYYY hh:mm:ss -> YYYY-MM-DD hh:mm:ss
_DATETIME="$(echo "${_DATE}" "${_TIME}" | sed 's#\(..\)/\(..\)/\(....\) \(..\):\(..\):\(..\)#\3-\2-\1 \4:\5:\6#g')"
timedatectl set-time "${_DATETIME}"
_SET_TIME="1"
fi
if _dialog --cr-wrap --title " Confirmation Dialog " --yesno "$(${_DATE_PROGRAM})" 0 0; then
_dialog --infobox "Clock configuration completed successfully." 3 50
_SET_TIME="1"
sleep 3
return 0
else

27
usr/bin/archboot-vconsole.sh
View file

@ -37,7 +37,7 @@ _do_vconsole() {
return 0
}
_set_vconsole() {
_vconsole_font() {
_CONTINUE=""
while [[ -z "${_CONTINUE}" ]]; do
if grep -q '^FONT=.*32' /etc/vconsole.conf; then
@ -54,6 +54,9 @@ _set_vconsole() {
_abort
fi
done
}
_vconsole_keymap() {
_CONTINUE=""
while [[ -z "${_CONTINUE}" ]]; do
# get list of 2 sign locale
@ -64,23 +67,17 @@ _set_vconsole() {
if _dialog --title " Keymap Region " --menu "" 12 40 6 ${_KEYMAPS} 2>${_ANSWER}; then
_KEYMAP=$(cat ${_ANSWER})
if [[ "${_KEYMAP}" == "OTHER" ]]; then
while [[ -z "${_CONTINUE}" ]]; do
#shellcheck disable=SC2086
if _dialog --title " Keymap Region " --menu "" 17 40 11 ${_OTHER_KEYMAPS} 2>${_ANSWER}; then
_KEYMAP=$(cat ${_ANSWER})
_CONTINUE=1
else
_abort
fi
done
#shellcheck disable=SC2086
if _dialog --title " Keymap Region " --menu "" 17 40 11 ${_OTHER_KEYMAPS} 2>${_ANSWER}; then
_KEYMAP=$(cat ${_ANSWER})
_CONTINUE=1
else
_CONTINUE=""
fi
fi
_CONTINUE=1
else
_abort
fi
done
_CONTINUE=""
while [[ -z "${_CONTINUE}" ]]; do
_KEYMAPS=""
for i in $(${_LIST_MAPS} | grep "^${_KEYMAP}" | grep -v '^carpalx' | grep -v 'defkey' | grep -v 'mac' | grep -v 'amiga' | grep -v 'sun' | grep -v 'atari'); do
_KEYMAPS="${_KEYMAPS} ${i} -"
@ -91,7 +88,7 @@ _set_vconsole() {
_KEYMAP=$(cat ${_ANSWER})
_CONTINUE=1
else
_abort
_CONTINUE=""
fi
done
}