diff options
Diffstat (limited to 'src/core/procedures')
| -rw-r--r-- | src/core/procedures/automatic | 22 | ||||
| -rw-r--r-- | src/core/procedures/base | 18 | ||||
| -rw-r--r-- | src/core/procedures/interactive | 22 | ||||
| -rw-r--r-- | src/core/procedures/partial-disks | 18 |
4 files changed, 40 insertions, 40 deletions
diff --git a/src/core/procedures/automatic b/src/core/procedures/automatic index ba533fa..a37803e 100644 --- a/src/core/procedures/automatic +++ b/src/core/procedures/automatic @@ -29,7 +29,7 @@ process_args () else usage exit 5 - fi + fi } @@ -61,9 +61,9 @@ worker_configure () worker_select_source () { - var_PKG_SOURCE_TYPE=${SOURCE:-cd} - var_FILE_URL=${FILE_URL:-file:///src/core/pkg} - var_SYNC_URL=${SYNC_URL:-} + var_PKG_SOURCE_TYPE=${SOURCE:-cd} + var_FILE_URL=${FILE_URL:-file:///src/core/pkg} + var_SYNC_URL=${SYNC_URL:-} } worker_prepare_disks () @@ -96,8 +96,8 @@ worker_package_list () worker_install_packages () { - target_prepare_pacman core extra community - installpkg + target_prepare_pacman core extra community + installpkg } @@ -110,11 +110,11 @@ worker_set_clock () worker_install_bootloader () { - get_grub_map + get_grub_map grub-install $var_GRUB_DEVICE --root-directory=/mnt - # check if we have a seperate bootdev (/boot) - # ToDo: This is double-work, find a better place! - # See comment in generate_grub_menulst and interactive_grub - bootdev=$(mount | grep $var_TARGET_DIR/boot | cut -d' ' -f 1) + # check if we have a seperate bootdev (/boot) + # ToDo: This is double-work, find a better place! + # See comment in generate_grub_menulst and interactive_grub + bootdev=$(mount | grep $var_TARGET_DIR/boot | cut -d' ' -f 1) generate_grub_menulst } diff --git a/src/core/procedures/base b/src/core/procedures/base index 3ff66b4..27080c9 100644 --- a/src/core/procedures/base +++ b/src/core/procedures/base @@ -98,15 +98,15 @@ worker_runtime_packages () worker_set_clock () { local default=no - while true; do - ask_option $default "Date/time configuration" '' required \ - "1" "Select region and timezone" \ - "2" "Set time and date" \ - "3" "Return to Main Menu" || return 1 - [ "$ANSWER_OPTION" = 1 ] && execute worker interactive_timezone && default=2 - [ "$ANSWER_OPTION" = 2 ] && check_depend worker interactive_timezone && execute worker interactive_time && default=3 - [ "$ANSWER_OPTION" = 3 ] && break - done + while true; do + ask_option $default "Date/time configuration" '' required \ + "1" "Select region and timezone" \ + "2" "Set time and date" \ + "3" "Return to Main Menu" || return 1 + [ "$ANSWER_OPTION" = 1 ] && execute worker interactive_timezone && default=2 + [ "$ANSWER_OPTION" = 2 ] && check_depend worker interactive_timezone && execute worker interactive_time && default=3 + [ "$ANSWER_OPTION" = 3 ] && break + done } diff --git a/src/core/procedures/interactive b/src/core/procedures/interactive index 5155e81..40021ef 100644 --- a/src/core/procedures/interactive +++ b/src/core/procedures/interactive @@ -42,7 +42,7 @@ start_process () default=1 while true do - mainmenu + mainmenu done } @@ -74,7 +74,7 @@ mainmenu() "8") check_depend worker configure_system && execute worker install_bootloader && default=9 ;; "9") execute worker msg_report ;; *) execute worker abort_installer;; - esac + esac } @@ -106,15 +106,15 @@ worker_select_source () select_source_extras_menu () { local default=no - while true; do - ask_option $default "NET (HTTP/FTP) Installation" "Make sure the network is ok and you've selected a mirror before continuing the installer" required \ - "1" "${workertitles['runtime_network']}" \ - "2" "Select mirror" \ - "3" "Return to Main Menu" || return 1 - [ "$ANSWER_OPTION" = 1 ] && execute worker runtime_network && default=2 - [ "$ANSWER_OPTION" = 2 ] && interactive_select_mirror && default=3 - [ "$ANSWER_OPTION" = 3 ] && break - done + while true; do + ask_option $default "NET (HTTP/FTP) Installation" "Make sure the network is ok and you've selected a mirror before continuing the installer" required \ + "1" "${workertitles['runtime_network']}" \ + "2" "Select mirror" \ + "3" "Return to Main Menu" || return 1 + [ "$ANSWER_OPTION" = 1 ] && execute worker runtime_network && default=2 + [ "$ANSWER_OPTION" = 2 ] && interactive_select_mirror && default=3 + [ "$ANSWER_OPTION" = 3 ] && break + done return 0 } diff --git a/src/core/procedures/partial-disks b/src/core/procedures/partial-disks index 8f17e33..c79914b 100644 --- a/src/core/procedures/partial-disks +++ b/src/core/procedures/partial-disks @@ -6,14 +6,14 @@ var_ARGS_USAGE="-o process/rollback: Operation: process the blockdevice layer or process_args () { - if [ "$1" = '-o' ] - then - [ "$2" != process -a "$2" != rollback ] && die_error "You must specify 'process' or 'rollback'" - OPERATION=$2 - else - usage - exit 5 - fi + if [ "$1" = '-o' ] + then + [ "$2" != process -a "$2" != rollback ] && die_error "You must specify 'process' or 'rollback'" + OPERATION=$2 + else + usage + exit 5 + fi } @@ -29,4 +29,4 @@ start_process () then rollback_filesystems fi -}
\ No newline at end of file +} |