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

reorder menu items

Browse source
This commit is contained in:
Tobias Powalowski 2021-09-26 15:28:45 +02:00
parent 0e4fb066d5
commit 71a1b28968
1 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -4324,7 +4324,7 @@ do_grub_uefi() {
} }
select_source() { select_source() {
NEXTITEM="4" NEXTITEM="2"
MODE="network" MODE="network"
if [[ ${S_NET} -eq 0 ]]; then if [[ ${S_NET} -eq 0 ]]; then
donetwork || return 1 donetwork || return 1
@ -4334,12 +4334,12 @@ select_source() {
fi fi
TITLE="Arch Linux Installation" TITLE="Arch Linux Installation"
getsource || return 1 getsource || return 1
NEXTITEM="5" NEXTITEM="3"
} }
set_clock() { set_clock() {
if [[ -e /usr/bin/tz ]]; then if [[ -e /usr/bin/tz ]]; then
tz --setup && NEXTITEM="3" tz --setup && NEXTITEM="4"
else else
DIALOG --msgbox "Error:\ntz script not found, aborting clock setting" 0 0 DIALOG --msgbox "Error:\ntz script not found, aborting clock setting" 0 0
fi fi
@ -4413,9 +4413,9 @@ prepare_storagedrive() {
esac esac
done done
if [[ "${CANCEL}" = "1" ]]; then if [[ "${CANCEL}" = "1" ]]; then
NEXTITEM="3"
else
NEXTITEM="4" NEXTITEM="4"
else
NEXTITEM="5"
fi fi
} }
@ -4843,9 +4843,9 @@ mainmenu() {
--menu "Use the UP and DOWN arrows to navigate menus.\nUse TAB to switch between buttons and ENTER to select." 18 58 14 \ --menu "Use the UP and DOWN arrows to navigate menus.\nUse TAB to switch between buttons and ENTER to select." 18 58 14 \
"0" "Set Keyboard And Console Font" \ "0" "Set Keyboard And Console Font" \
"1" "Set up Network" \ "1" "Set up Network" \
"2" "Set Time And Date" \ "2" "Select Source" \
"3" "Prepare Storage Drive" \ "3" "Set Time And Date" \
"4" "Select Source" \ "4" "Prepare Storage Drive" \
"5" "Install Packages" \ "5" "Install Packages" \
"6" "Configure System" \ "6" "Configure System" \
"7" "Install Bootloader" \ "7" "Install Bootloader" \
@ -4857,11 +4857,11 @@ mainmenu() {
"1") "1")
donetwork ;; donetwork ;;
"2") "2")
set_clock ;;
"3")
prepare_storagedrive ;;
"4")
select_source ;; select_source ;;
"3")
set_clock ;;
"4")
prepare_storagedrive ;;
"5") "5")
install_packages ;; install_packages ;;
"6") "6")