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 functions

Browse source
This commit is contained in:
Tobias Powalowski 2023-07-12 12:33:00 +02:00
parent b80af07ac2
commit f0d7557e05
1 changed files with 25 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -139,13 +139,33 @@ _set_guid() {
fi fi
} }
_set_vconsole() { _configure_vconsole() {
if [[ -e /usr/bin/km ]]; then if [[ -e /usr/bin/km ]]; then
km && _NEXTITEM=1 km && _NEXTITEM=1
elif [[ -e /usr/bin/archboot-km.sh ]]; then elif [[ -e /usr/bin/archboot-km.sh ]]; then
archboot-km.sh && _NEXTITEM=1 archboot-km.sh && _NEXTITEM=1
else else
_dialog --msgbox "Error:\nkm script not found, aborting console and keyboard setting." 0 0 _dialog --msgbox "Error:\nkm script not found, aborting console and keyboard configuration." 0 0
fi
}
_configure_network() {
if [[ -e /usr/bin/net ]]; then
net && _NEXTITEM="2"
elif [[ -e /usr/bin/archboot-net.sh ]]; then
archboot-tz.sh && _NEXTITEM="2"
else
_dialog --msgbox "Error:\nnet script not found, aborting network configuration" 0 0
fi
}
_configure_clock() {
if [[ -e /usr/bin/tz ]]; then
tz && _NEXTITEM="3"
elif [[ -e /usr/bin/archboot-tz.sh ]]; then
archboot-tz.sh && _NEXTITEM="3"
else
_dialog --msgbox "Error:\ntz script not found, aborting clock configuration" 0 0
fi fi
} }
@ -167,16 +187,6 @@ _select_source() {
_NEXTITEM="4" _NEXTITEM="4"
} }
_set_clock() {
if [[ -e /usr/bin/tz ]]; then
tz && _NEXTITEM="3"
elif [[ -e /usr/bin/archboot-tz.sh ]]; then
archboot-tz.sh && _NEXTITEM="3"
else
_dialog --msgbox "Error:\ntz script not found, aborting clock setting" 0 0
fi
}
_prepare_storagedrive() { _prepare_storagedrive() {
_S_MKFSAUTO="" _S_MKFSAUTO=""
_S_MKFS="" _S_MKFS=""
@ -297,16 +307,15 @@ _mainmenu() {
_NEXTITEM="$(cat ${_ANSWER})" _NEXTITEM="$(cat ${_ANSWER})"
case $(cat ${_ANSWER}) in case $(cat ${_ANSWER}) in
"0") "0")
_set_vconsole ;; _configure_vconsole ;;
"1") "1")
if [[ -e "/var/cache/pacman/pkg/archboot.db" ]]; then if [[ -e "/var/cache/pacman/pkg/archboot.db" ]]; then
_abort_local_mode _abort_local_mode
else else
_donetwork _configure_network
fi ;; fi ;;
"2") "2")
_set_clock ;; _configure_clock ;;
"3") "3")
if [[ "${_DESTDIR}" == "/" ]]; then if [[ "${_DESTDIR}" == "/" ]]; then
_abort_running_system _abort_running_system