From e0b95765311659755568f458dcd59f1a72cb687c Mon Sep 17 00:00:00 2001 From: Tobias Powalowski Date: Wed, 6 Sep 2023 09:27:01 +0200 Subject: [PATCH] replace Exit with LABEL --- usr/bin/archboot-launcher.sh | 2 +- usr/bin/archboot-localize.sh | 2 +- usr/bin/archboot-pacsetup.sh | 2 +- usr/lib/archboot/installer/common.sh | 1 + 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/usr/bin/archboot-launcher.sh b/usr/bin/archboot-launcher.sh index bbf425fbd..b50a1cd6b 100755 --- a/usr/bin/archboot-launcher.sh +++ b/usr/bin/archboot-launcher.sh @@ -107,7 +107,7 @@ _launcher() { if [[ -n "${_MANAGE[*]}" ]]; then _MENU+=( "3" "Manage Archboot Environment" ) fi - _dialog --default-item "${_DEFAULTITEM}" --cancel-label "Exit" --title " Main Menu " --menu "" 9 40 5 \ + _dialog --default-item "${_DEFAULTITEM}" --cancel-label "${_LABEL}" --title " Main Menu " --menu "" 9 40 5 \ "1" "Launch Archboot Setup" "${_MENU[@]}" 2>"${_ANSWER}" case $(cat "${_ANSWER}") in "1") diff --git a/usr/bin/archboot-localize.sh b/usr/bin/archboot-localize.sh index acc451fe6..97617224d 100755 --- a/usr/bin/archboot-localize.sh +++ b/usr/bin/archboot-localize.sh @@ -12,7 +12,7 @@ _locale_menu() { _OTHER_LOCALES="be_BY Belarusian bg_BG Bulgarian cs_CZ Czech da_DK Dansk fi_FI Finnish el_GR Greek hu_HU Hungarian it_IT Italian lt_LT Lithuanian lv_LV Latvian mk_MK Macedonian nl_NL Dutch nn_NO Norwegian pl_PL Polish ro_RO Romanian ru_RU Russian sk_SK Slovak sr_RS Serbian sv_SE Swedish uk_UA Ukrainian" _CANCEL="" #shellcheck disable=SC2086 - _dialog --cancel-label "Exit" --title " Locale " --menu "" 12 35 5 ${_LOCALES} 2>${_ANSWER} || _abort + _dialog --cancel-label "${_LABEL}" --title " Locale " --menu "" 12 35 5 ${_LOCALES} 2>${_ANSWER} || _abort _LOCALE=$(cat "${_ANSWER}") if [[ "${_LOCALE}" == "OTHER" ]]; then #shellcheck disable=SC2086 diff --git a/usr/bin/archboot-pacsetup.sh b/usr/bin/archboot-pacsetup.sh index e31a03cf7..2b39cec17 100755 --- a/usr/bin/archboot-pacsetup.sh +++ b/usr/bin/archboot-pacsetup.sh @@ -34,7 +34,7 @@ _select_mirror() { _SYNC_URL="" while [[ -z "${_SYNC_URL}" ]]; do #shellcheck disable=SC2086 - _dialog --cancel-label "Exit" --title " Package Mirror " --menu "" 13 55 7 \ + _dialog --cancel-label "${_LABEL}" --title " Package Mirror " --menu "" 13 55 7 \ "Custom Mirror" "_" ${_MIRRORS} 2>${_ANSWER} || _abort #shellcheck disable=SC2155 local _SERVER=$(cat "${_ANSWER}") diff --git a/usr/lib/archboot/installer/common.sh b/usr/lib/archboot/installer/common.sh index e38572b2e..2dabb2e52 100644 --- a/usr/lib/archboot/installer/common.sh +++ b/usr/lib/archboot/installer/common.sh @@ -2,6 +2,7 @@ # SPDX-License-Identifier: GPL-3.0-or-later # created by Tobias Powalowski # don't use _DESTDIR=/mnt because it's intended to mount other things there! + # check first if bootet in archboot if grep -qw '^archboot' /etc/hostname; then _DESTDIR="/install"