mirror of
https://gitlab.archlinux.org/tpowa/archboot.git
synced 2024-09-20 03:50:37 +02:00
remove cancel-label
This commit is contained in:
parent
62d2236333
commit
2a343e24c5
6 changed files with 8 additions and 18 deletions
|
@ -32,7 +32,7 @@ _timezone () {
|
||||||
_ZONES="${_ZONES} ${i} -"
|
_ZONES="${_ZONES} ${i} -"
|
||||||
done
|
done
|
||||||
#shellcheck disable=SC2086
|
#shellcheck disable=SC2086
|
||||||
if _dialog --cancel-label "Back" --title " Timezone " --menu "" 21 30 16 ${_ZONES} 2>${_ANSWER}; then
|
if _dialog --title " Timezone " --menu "" 21 30 16 ${_ZONES} 2>${_ANSWER}; then
|
||||||
_SET_ZONE="1"
|
_SET_ZONE="1"
|
||||||
_ZONE=$(cat ${_ANSWER})
|
_ZONE=$(cat ${_ANSWER})
|
||||||
[[ "${_ZONE}" == "${_REGION}" ]] || _ZONE="${_REGION}/${_ZONE}"
|
[[ "${_ZONE}" == "${_REGION}" ]] || _ZONE="${_REGION}/${_ZONE}"
|
||||||
|
|
|
@ -20,7 +20,7 @@ _check_manage() {
|
||||||
}
|
}
|
||||||
|
|
||||||
_desktop () {
|
_desktop () {
|
||||||
_dialog --cancel-label "Back" --title " Desktop Menu " --menu "" 10 40 6 "${_DESKTOP[@]}" 2>"${_ANSWER}" || return 1
|
_dialog --title " Desktop Menu " --menu "" 10 40 6 "${_DESKTOP[@]}" 2>"${_ANSWER}" || return 1
|
||||||
[[ -e /.launcher-running ]] && rm /.launcher-running
|
[[ -e /.launcher-running ]] && rm /.launcher-running
|
||||||
_EXIT=$(cat "${_ANSWER}")
|
_EXIT=$(cat "${_ANSWER}")
|
||||||
source /etc/locale.conf
|
source /etc/locale.conf
|
||||||
|
@ -51,7 +51,7 @@ _desktop () {
|
||||||
}
|
}
|
||||||
|
|
||||||
_manage() {
|
_manage() {
|
||||||
_dialog --cancel-label "Back" --title " Manage Archboot Menu " --menu "" 9 50 5 "${_MANAGE[@]}" 2>"${_ANSWER}" || return 1
|
_dialog --title " Manage Archboot Menu " --menu "" 9 50 5 "${_MANAGE[@]}" 2>"${_ANSWER}" || return 1
|
||||||
clear
|
clear
|
||||||
[[ -e /.launcher-running ]] && rm /.launcher-running
|
[[ -e /.launcher-running ]] && rm /.launcher-running
|
||||||
_EXIT=$(cat "${_ANSWER}")
|
_EXIT=$(cat "${_ANSWER}")
|
||||||
|
@ -67,7 +67,7 @@ _manage() {
|
||||||
|
|
||||||
_exit() {
|
_exit() {
|
||||||
#shellcheck disable=SC2086
|
#shellcheck disable=SC2086
|
||||||
_dialog --cancel-label "Back" --title " Exit Menu " --menu "" 9 30 5 \
|
_dialog --title " Exit Menu " --menu "" 9 30 5 \
|
||||||
"1" "Exit Program" \
|
"1" "Exit Program" \
|
||||||
"2" "Reboot System" \
|
"2" "Reboot System" \
|
||||||
"3" "Poweroff System" 2>${_ANSWER} || return 1
|
"3" "Poweroff System" 2>${_ANSWER} || return 1
|
||||||
|
|
|
@ -16,7 +16,7 @@ _locale_menu() {
|
||||||
_LOCALE=$(cat "${_ANSWER}")
|
_LOCALE=$(cat "${_ANSWER}")
|
||||||
if [[ "${_LOCALE}" == "OTHER" ]]; then
|
if [[ "${_LOCALE}" == "OTHER" ]]; then
|
||||||
#shellcheck disable=SC2086
|
#shellcheck disable=SC2086
|
||||||
if _dialog --cancel-label "Back" --title " Other Locale " --menu "" 17 35 11 ${_OTHER_LOCALES} 2>${_ANSWER}; then
|
if _dialog --title " Other Locale " --menu "" 17 35 11 ${_OTHER_LOCALES} 2>${_ANSWER}; then
|
||||||
_LOCALE=$(cat ${_ANSWER})
|
_LOCALE=$(cat ${_ANSWER})
|
||||||
else
|
else
|
||||||
_LOCALE=""
|
_LOCALE=""
|
||||||
|
@ -41,7 +41,7 @@ _vconsole_keymap() {
|
||||||
_KEYMAPS="${_KEYMAPS} ${i} -"
|
_KEYMAPS="${_KEYMAPS} ${i} -"
|
||||||
done
|
done
|
||||||
#shellcheck disable=SC2086
|
#shellcheck disable=SC2086
|
||||||
if _dialog --cancel-label "Back" --title " Keymap Layout " --menu "" 13 40 7 ${_KEYMAPS} 2>${_ANSWER}; then
|
if _dialog --title " Keymap Layout " --menu "" 13 40 7 ${_KEYMAPS} 2>${_ANSWER}; then
|
||||||
#shellcheck disable=SC2086
|
#shellcheck disable=SC2086
|
||||||
_KEYMAP=$(cat ${_ANSWER})
|
_KEYMAP=$(cat ${_ANSWER})
|
||||||
else
|
else
|
||||||
|
|
|
@ -39,7 +39,7 @@ _select_mirror() {
|
||||||
#shellcheck disable=SC2155
|
#shellcheck disable=SC2155
|
||||||
local _SERVER=$(cat "${_ANSWER}")
|
local _SERVER=$(cat "${_ANSWER}")
|
||||||
if [[ "${_SERVER}" == "Custom Mirror" ]]; then
|
if [[ "${_SERVER}" == "Custom Mirror" ]]; then
|
||||||
_dialog --cancel-label "Back" --inputbox "Enter the full URL to repositories." 8 65 \
|
_dialog --inputbox "Enter the full URL to repositories." 8 65 \
|
||||||
"" 2>"${_ANSWER}" || _SYNC_URL=""
|
"" 2>"${_ANSWER}" || _SYNC_URL=""
|
||||||
_SYNC_URL=$(cat "${_ANSWER}")
|
_SYNC_URL=$(cat "${_ANSWER}")
|
||||||
else
|
else
|
||||||
|
|
|
@ -79,7 +79,7 @@ _riscv64_check() {
|
||||||
|
|
||||||
# returns: whatever dialog did
|
# returns: whatever dialog did
|
||||||
_dialog() {
|
_dialog() {
|
||||||
dialog --backtitle "${_TITLE}" --aspect 15 "$@"
|
dialog --cancel-label "Back" --backtitle "${_TITLE}" --aspect 15 "$@"
|
||||||
return $?
|
return $?
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -26,16 +26,6 @@ _set_title() {
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
# _dialog()
|
|
||||||
# an el-cheapo dialog wrapper
|
|
||||||
#
|
|
||||||
# parameters: see dialog(1)
|
|
||||||
# returns: whatever dialog did
|
|
||||||
_dialog() {
|
|
||||||
dialog --cancel-label "Back" --backtitle "${_TITLE}" --aspect 15 "$@"
|
|
||||||
return $?
|
|
||||||
}
|
|
||||||
|
|
||||||
_printk()
|
_printk()
|
||||||
{
|
{
|
||||||
case ${1} in
|
case ${1} in
|
||||||
|
|
Loading…
Reference in a new issue