diff options
| author | Dieter Plaetinck <dieter@plaetinck.be> | 2010-12-28 15:10:37 +0100 |
|---|---|---|
| committer | Dieter Plaetinck <dieter@plaetinck.be> | 2010-12-28 15:15:58 +0100 |
| commit | d2dfddb854d66977f8b30d9fa118a704dd8dfc12 (patch) | |
| tree | 35bc2b6dbbe3f30750c5547fffee27935a49fc1c /src/core/procedures | |
| parent | e079b88505229fe79bd03a3c542f277ffaa4c30e (diff) | |
manage $EDITOR more properly
since 3cee8e663a4da69456b493acccbda27064209a35 libui-sh can manage the
$EDITOR preference, so we can simplify and cleanup our code.
we now also explicitly enable the user to change
$EDITOR in the interactive procedure even when it is already set correctly,
so there is a new menu entry for that.
Diffstat (limited to 'src/core/procedures')
| -rw-r--r-- | src/core/procedures/interactive | 43 |
1 files changed, 25 insertions, 18 deletions
diff --git a/src/core/procedures/interactive b/src/core/procedures/interactive index 0223763..d638e1c 100644 --- a/src/core/procedures/interactive +++ b/src/core/procedures/interactive @@ -4,7 +4,6 @@ depend_procedure core base # esp for auto_{network,locale,fstab}, intro and set_ # This is a port of the original /arch/setup script. It doesn't use aif phases but uses it's own menu-based flow (phase) control -EDITOR= BLOCK_ROLLBACK_USELESS=1 # clock @@ -16,6 +15,7 @@ TIMEZONE= DEFAULTFS="/boot:32:ext2:+ swap:256:swap /:7500:ext3 /home:*:ext3" worker_select_source_title='Select Source' +worker_set_editor_title='Set Editor' worker_runtime_network_title='Setup Network' worker_select_mirror_title='Choose Mirror' worker_set_clock_title='Set clock' @@ -51,40 +51,43 @@ mainmenu() ask_option $default "MAIN MENU" '' required \ "1" "$worker_select_source_title" \ - "2" "$worker_set_clock_title" \ - "3" "$worker_prepare_disks_title" \ - "4" "$worker_package_list_title" \ - "5" "$worker_install_packages_title" \ - "6" "$worker_configure_system_title" \ - "7" "$worker_install_bootloader_title" \ - "8" "Exit Install" + "2" "$worker_set_editor_title" \ + "3" "$worker_set_clock_title" \ + "4" "$worker_prepare_disks_title" \ + "5" "$worker_package_list_title" \ + "6" "$worker_install_packages_title" \ + "7" "$worker_configure_system_title" \ + "8" "$worker_install_bootloader_title" \ + "9" "Exit Install" case $ANSWER_OPTION in "1") execute worker select_source; local ret=$?; [ $ret -eq 0 -a "$var_PKG_SOURCE_TYPE" = net ] && execute worker select_source_extras_menu [ $ret -eq 0 ] && execute worker runtime_packages && NEXTITEM=2 ;; - "2") - execute worker set_clock && NEXTITEM=3 ;; + "2") + execute worker set_editor && NEXTITEM=3 ;; "3") - execute worker prepare_disks && NEXTITEM=4 ;; + execute worker set_clock && NEXTITEM=4 ;; "4") - check_depend worker prepare_disks && \ - check_depend worker select_source && execute worker package_list && NEXTITEM=5 ;; + execute worker prepare_disks && NEXTITEM=5 ;; "5") + check_depend worker prepare_disks && \ + check_depend worker select_source && execute worker package_list && NEXTITEM=6 ;; + "6") check_depend worker package_list && \ check_depend worker select_source && execute worker install_packages && { execute worker auto_fstab ; \ execute worker auto_locale ; \ execute worker auto_keymap_font; - true ; } && NEXTITEM=6 ;; - "6") + true ; } && NEXTITEM=7 ;; + "7") check_depend worker install_packages && execute worker auto_network && \ execute worker configure_system && { execute worker mkinitcpio ; \ execute worker locales ; execute worker initialtime ; - true ; } && NEXTITEM=7 ;; - "7") - check_depend worker configure_system && execute worker install_bootloader && NEXTITEM=8 ;; + true ; } && NEXTITEM=8 ;; "8") + check_depend worker configure_system && execute worker install_bootloader && NEXTITEM=9 ;; + "9") notify "If the install finished successfully, you can now type 'reboot' to restart the system." && stop_installer ;; *) execute worker abort_installer;; @@ -112,6 +115,10 @@ worker_select_source () return 1 } +worker_set_editor () +{ + seteditor force +} worker_intro () { |