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

rename parameters

Browse source
This commit is contained in:
Tobias Powalowski 2023-01-08 08:57:51 +01:00
parent 277eec8e18
commit 3e7f9e13ec
3 changed files with 36 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

72
usr/bin/archboot-km.sh
View file

@ -1,8 +1,8 @@
#!/usr/bin/env bash #!/usr/bin/env bash
# written by Tobias Powalowski <tpowa@archlinux.org> # written by Tobias Powalowski <tpowa@archlinux.org>
ANSWER="/tmp/.km" _ANSWER="/tmp/.km"
TITLE="Arch Linux Console Font And Keymap Setting" _TITLE="Arch Linux Console Font And Keymap Setting"
LIST_MAPS="localectl list-keymaps --no-pager" LIST_MAPS="localectl list-keymaps --no-pager"
abort() abort()
@ -16,8 +16,8 @@ abort()
} }
abort_dialog() { abort_dialog() {
if [[ "${CANCEL}" = "1" ]]; then if [[ "${_CANCEL}" = "1" ]]; then
S_NEXTITEM="1" _S_NEXTITEM="1"
return 1 return 1
fi fi
} }
@ -28,14 +28,14 @@ abort_dialog() {
# parameters: see dialog(1) # parameters: see dialog(1)
# returns: whatever dialog did # returns: whatever dialog did
DIALOG() { DIALOG() {
dialog --backtitle "${TITLE}" --aspect 15 "$@" dialog --backtitle "${_TITLE}" --aspect 15 "$@"
return $? return $?
} }
do_vconsole() { do_vconsole() {
DIALOG --infobox "Setting console font ${font} and keymap ${keymap} ..." 3 80 DIALOG --infobox "Setting console font ${_FONT} and keymap ${_KEYMAP} ..." 3 80
echo KEYMAP="${keymap}" > /etc/vconsole.conf echo KEYMAP="${_KEYMAP}" > /etc/vconsole.conf
echo FONT="${font}" >> /etc/vconsole.conf echo FONT="${_FONT}" >> /etc/vconsole.conf
systemctl restart systemd-vconsole-setup systemctl restart systemd-vconsole-setup
sleep 2 sleep 2
} }
@ -43,59 +43,59 @@ do_vconsole() {
set_vconsole() { set_vconsole() {
if grep -qw 'sun32' /etc/vconsole.conf; then if grep -qw 'sun32' /etc/vconsole.conf; then
DIALOG --infobox "Detected big screen size, using 32 font size now ..." 3 60 DIALOG --infobox "Detected big screen size, using 32 font size now ..." 3 60
font="latarcyrheb-sun32" _FONT="latarcyrheb-sun32"
sleep 2 sleep 2
else else
FONTS="latarcyrheb-sun16 Worldwide eurlatgr Europe" _FONTS="latarcyrheb-sun16 Worldwide eurlatgr Europe"
CANCEL= _CANCEL=
#shellcheck disable=SC2086 #shellcheck disable=SC2086
DIALOG --menu "\n Select Console Font:\n\n Font Name Region" 12 40 14 ${FONTS} 2>${ANSWER} || CANCEL=1 DIALOG --menu "\n Select Console Font:\n\n Font Name Region" 12 40 14 ${_FONTS} 2>${_ANSWER} || _CANCEL=1
abort_dialog || return 1 abort_dialog || return 1
#shellcheck disable=SC2086 #shellcheck disable=SC2086
font=$(cat ${ANSWER}) _FONT=$(cat ${_ANSWER})
fi fi
echo "${font}" > /tmp/.font echo "${_FONT}" > /tmp/.font
# get list of 2 sign locale # get list of 2 sign locale
# ${KEYMAP} | grep -v '...' | grep "^[a-z]" # ${KEYMAP} | grep -v '...' | grep "^[a-z]"
KEYMAPS="us English de German es Spanish fr French pt Portuguese ru Russian OTHER More" _KEYMAPS="us English de German es Spanish fr French pt Portuguese ru Russian OTHER More"
OTHER_KEYMAPS="be Belarusian bg Bulgarian br Brazil ca Canada cz Czech dk Danish et Estonian fa Iran fi Finnish gr Greek hu Hungarian it Italian lt Lithuanian lv Latvian mk Macedonian nl Dutch no Norwegian pl Polish ro Romanian sk Slovak sr Serbian sv Swedish uk Ukrainian" OTHER__KEYMAPS="be Belarusian bg Bulgarian br Brazil ca Canada cz Czech dk Danish et Estonian fa Iran fi Finnish gr Greek hu Hungarian it Italian lt Lithuanian lv Latvian mk Macedonian nl Dutch no Norwegian pl Polish ro Romanian sk Slovak sr Serbian sv Swedish uk Ukrainian"
CANCEL="" _CANCEL=""
#shellcheck disable=SC2086 #shellcheck disable=SC2086
DIALOG --menu "Select A Keymap Region:" 14 30 8 ${KEYMAPS} 2>${ANSWER} || CANCEL="1" DIALOG --menu "Select A Keymap Region:" 14 30 8 ${_KEYMAPS} 2>${_ANSWER} || _CANCEL="1"
keymap=$(cat ${ANSWER}) _KEYMAP=$(cat ${_ANSWER})
if [[ "${keymap}" == "OTHER" ]]; then if [[ "${_KEYMAP}" == "OTHER" ]]; then
#shellcheck disable=SC2086 #shellcheck disable=SC2086
DIALOG --menu "Select A Keymap Region:" 18 30 12 ${OTHER_KEYMAPS} 2>${ANSWER} || CANCEL="1" DIALOG --menu "Select A Keymap Region:" 18 30 12 ${OTHER__KEYMAPS} 2>${_ANSWER} || _CANCEL="1"
keymap=$(cat ${ANSWER}) _KEYMAP=$(cat ${_ANSWER})
fi fi
abort_dialog || return 1 abort_dialog || return 1
KEYMAPS="" _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 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} -" _KEYMAPS="${_KEYMAPS} ${i} -"
done done
CANCEL="" _CANCEL=""
#shellcheck disable=SC2086 #shellcheck disable=SC2086
DIALOG --menu "Select A Keymap Layout:" 14 30 8 ${KEYMAPS} 2>${ANSWER} || CANCEL="1" DIALOG --menu "Select A Keymap Layout:" 14 30 8 ${_KEYMAPS} 2>${_ANSWER} || _CANCEL="1"
abort_dialog || return 1 abort_dialog || return 1
#shellcheck disable=SC2086 #shellcheck disable=SC2086
keymap=$(cat ${ANSWER}) _KEYMAP=$(cat ${_ANSWER})
echo "${keymap}" > /tmp/.keymap echo "${_KEYMAP}" > /tmp/.keymap
S_NEXTITEM=2 _S_NEXTITEM=2
} }
mainmenu() { mainmenu() {
if [[ -n "${S_NEXTITEM}" ]]; then if [[ -n "${_S_NEXTITEM}" ]]; then
DEFAULT="--default-item ${S_NEXTITEM}" _DEFAULT="--default-item ${_S_NEXTITEM}"
else else
DEFAULT="" _DEFAULT=""
fi fi
#shellcheck disable=SC2086 #shellcheck disable=SC2086
DIALOG ${DEFAULT} --backtitle "${TITLE}" --title " MAIN MENU " \ DIALOG ${_DEFAULT} --backtitle "${_TITLE}" --title " MAIN MENU " \
--menu "Use the UP and DOWN arrows to navigate menus.\nUse TAB to switch between buttons and ENTER to select." 10 58 12 \ --menu "Use the UP and DOWN arrows to navigate menus.\nUse TAB to switch between buttons and ENTER to select." 10 58 12 \
"1" "Set Console Font And Keymap" \ "1" "Set Console Font And Keymap" \
"2" "${EXIT}" 2>${ANSWER} "2" "${EXIT}" 2>${_ANSWER}
#shellcheck disable=SC2086 #shellcheck disable=SC2086
case $(cat ${ANSWER}) in case $(cat ${_ANSWER}) in
"1") "1")
set_vconsole || return 1 set_vconsole || return 1
do_vconsole do_vconsole

1
usr/bin/archboot-setup.sh
View file

@ -103,7 +103,6 @@ configure_system() {
set_locale || return 1 set_locale || return 1
auto_mkinitcpio auto_mkinitcpio
## END PREPROCESS ## ## END PREPROCESS ##
_FILE="" _FILE=""
_S_CONFIG="" _S_CONFIG=""
# main menu loop # main menu loop

1
usr/lib/archboot/installer/base.sh
View file

@ -20,7 +20,6 @@ _VC="VC${_VC_NUM}"
_S_SRC=0 # choose mirror _S_SRC=0 # choose mirror
_S_MKFS=0 # formatting _S_MKFS=0 # formatting
_S_MKFSAUTO=0 # auto fs part/formatting _S_MKFSAUTO=0 # auto fs part/formatting
_S_BOOTLOADER=0 # bootloader installation
# menu item tracker- autoselect the next item # menu item tracker- autoselect the next item
_NEXTITEM="" _NEXTITEM=""
# To allow choice in script set EDITOR="" # To allow choice in script set EDITOR=""