mirror of
https://gitlab.archlinux.org/tpowa/archboot.git
synced 2024-09-20 03:50:37 +02:00
correct exit labels if run from setup
This commit is contained in:
parent
ff72d44065
commit
70e8077fb6
3 changed files with 19 additions and 4 deletions
|
@ -41,7 +41,7 @@ _timezone () {
|
||||||
while [[ -z "${_CONTINUE}" ]]; do
|
while [[ -z "${_CONTINUE}" ]]; do
|
||||||
_REGIONS="America - Europe - Africa - Asia - Australia -"
|
_REGIONS="America - Europe - Africa - Asia - Australia -"
|
||||||
#shellcheck disable=SC2086
|
#shellcheck disable=SC2086
|
||||||
if _dialog --cancel-label "Exit" --title " Timezone Region " --menu "" 11 30 6 ${_REGIONS} 2>${_ANSWER}; then
|
if _dialog --cancel-label "${_LABEL}" --title " Timezone Region " --menu "" 11 30 6 ${_REGIONS} 2>${_ANSWER}; then
|
||||||
_REGION=$(cat ${_ANSWER})
|
_REGION=$(cat ${_ANSWER})
|
||||||
_ZONES=""
|
_ZONES=""
|
||||||
_CONTINUE=1
|
_CONTINUE=1
|
||||||
|
@ -113,6 +113,11 @@ if [[ -e /tmp/.clock-running ]]; then
|
||||||
fi
|
fi
|
||||||
: >/tmp/.clock-running
|
: >/tmp/.clock-running
|
||||||
_SET_TIME=""
|
_SET_TIME=""
|
||||||
|
if [[ -n "${1}" ]]; then
|
||||||
|
_LABEL="Back"
|
||||||
|
else
|
||||||
|
_LABEL="Exit"
|
||||||
|
fi
|
||||||
while [[ -z "${_SET_TIME}" ]]; do
|
while [[ -z "${_SET_TIME}" ]]; do
|
||||||
_timezone
|
_timezone
|
||||||
_timeset
|
_timeset
|
||||||
|
|
|
@ -66,7 +66,7 @@ _wireless() {
|
||||||
iwctl station "${_INTERFACE}" scan &>"${_NO_LOG}"
|
iwctl station "${_INTERFACE}" scan &>"${_NO_LOG}"
|
||||||
sleep 5
|
sleep 5
|
||||||
#shellcheck disable=SC2086,SC2046
|
#shellcheck disable=SC2086,SC2046
|
||||||
if _dialog --cancel-label "Exit" --title " SSID Scan Result " --menu "Empty spaces in your SSID are replaced by '+' char" 13 60 6 \
|
if _dialog --cancel-label "${_LABEL}" --title " SSID Scan Result " --menu "Empty spaces in your SSID are replaced by '+' char" 13 60 6 \
|
||||||
$(_essid_list _) \
|
$(_essid_list _) \
|
||||||
"HIDDEN" "SSID" "RESCAN" "SSIDs" 2>"${_ANSWER}"; then
|
"HIDDEN" "SSID" "RESCAN" "SSIDs" 2>"${_ANSWER}"; then
|
||||||
_WLAN_SSID=$(cat "${_ANSWER}")
|
_WLAN_SSID=$(cat "${_ANSWER}")
|
||||||
|
@ -124,7 +124,7 @@ _network() {
|
||||||
_INTERFACES=$(_net_interfaces)
|
_INTERFACES=$(_net_interfaces)
|
||||||
while [[ -z "${_INTERFACE}" ]]; do
|
while [[ -z "${_INTERFACE}" ]]; do
|
||||||
#shellcheck disable=SC2086
|
#shellcheck disable=SC2086
|
||||||
if _dialog --cancel-label "Exit" --title " Network Interface " --menu "" 11 40 5 ${_INTERFACES} 2>"${_ANSWER}"; then
|
if _dialog --cancel-label "${_LABEL}" --title " Network Interface " --menu "" 11 40 5 ${_INTERFACES} 2>"${_ANSWER}"; then
|
||||||
_INTERFACE=$(cat "${_ANSWER}")
|
_INTERFACE=$(cat "${_ANSWER}")
|
||||||
else
|
else
|
||||||
_abort
|
_abort
|
||||||
|
@ -229,6 +229,11 @@ if [[ -e /tmp/.network-running ]]; then
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
: >/tmp/.network-running
|
: >/tmp/.network-running
|
||||||
|
if [[ -n "${1}" ]]; then
|
||||||
|
_LABEL="Back"
|
||||||
|
else
|
||||||
|
_LABEL="Exit"
|
||||||
|
fi
|
||||||
while true; do
|
while true; do
|
||||||
_network && break
|
_network && break
|
||||||
done
|
done
|
||||||
|
|
|
@ -46,7 +46,7 @@ _vconsole_font() {
|
||||||
_FONTS="ter-v16n Worldwide latarcyrheb-sun16 Worldwide eurlatgr Europe"
|
_FONTS="ter-v16n Worldwide latarcyrheb-sun16 Worldwide eurlatgr Europe"
|
||||||
fi
|
fi
|
||||||
#shellcheck disable=SC2086
|
#shellcheck disable=SC2086
|
||||||
if _dialog --cancel-label "Exit" --title " Vconsole Font " --menu "" 9 40 3 ${_FONTS} 2>${_ANSWER}; then
|
if _dialog --cancel-label "${_LABEL}" --title " Vconsole Font " --menu "" 9 40 3 ${_FONTS} 2>${_ANSWER}; then
|
||||||
#shellcheck disable=SC2086
|
#shellcheck disable=SC2086
|
||||||
_FONT=$(cat ${_ANSWER})
|
_FONT=$(cat ${_ANSWER})
|
||||||
_CONTINUE=1
|
_CONTINUE=1
|
||||||
|
@ -101,6 +101,11 @@ if [[ -e /tmp/.vconsole-running ]]; then
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
: >/tmp/.vconsole-running
|
: >/tmp/.vconsole-running
|
||||||
|
if [[ -n "${1}" ]]; then
|
||||||
|
_LABEL="Back"
|
||||||
|
else
|
||||||
|
_LABEL="Exit"
|
||||||
|
fi
|
||||||
_vconsole_font
|
_vconsole_font
|
||||||
_vconsole_keymap
|
_vconsole_keymap
|
||||||
[[ -e /tmp/.vconsole-running ]] && rm /tmp/.vconsole-running
|
[[ -e /tmp/.vconsole-running ]] && rm /tmp/.vconsole-running
|
||||||
|
|
Loading…
Reference in a new issue