From 127d05e56fa08ca40b4301db2df99ea92d3fd218 Mon Sep 17 00:00:00 2001 From: Dieter Plaetinck Date: Mon, 3 Nov 2008 16:22:59 +0100 Subject: main menu uses new lib-based menu --- src/core/procedures/interactive | 30 +++++++++++++----------------- 1 file changed, 13 insertions(+), 17 deletions(-) (limited to 'src/core/procedures/interactive') diff --git a/src/core/procedures/interactive b/src/core/procedures/interactive index b8d1cb9..52a6dbf 100644 --- a/src/core/procedures/interactive +++ b/src/core/procedures/interactive @@ -62,23 +62,19 @@ start_process () mainmenu() { - if [ -n "$NEXTITEM" ]; then - DEFAULT="--default-item $NEXTITEM" - else - DEFAULT="" - fi - _dia_DIALOG $DEFAULT --title " MAIN MENU " \ - --menu "Use the UP and DOWN arrows to navigate menus. Use TAB to switch between buttons and ENTER to select." 16 55 8 \ - "0" "Select Source" \ - "1" "Set Clock" \ - "2" "Prepare Hard Drive" \ - "3" "Select Packages" \ - "4" "Install Packages" \ - "5" "Configure System" \ - "6" "Install Bootloader" \ - "7" "Exit Install" 2>$ANSWER - NEXTITEM="$(cat $ANSWER)" - case $(cat $ANSWER) in + default=no + [ -n "$NEXTITEM" ] && default="$NEXTITEM" + ask_option $default "MAIN MENU" \ + "0" "Select Source" \ + "1" "Set Clock" \ + "2" "Prepare Hard Drive" \ + "3" "Select Packages" \ + "4" "Install Packages" \ + "5" "Configure System" \ + "6" "Install Bootloader" \ + "7" "Exit Install" + NEXTITEM="$(cat $ANSWER)" + case $(cat $ANSWER) in "0") execute worker select_source; ret=$? if [ $ret -eq 0 -a "$var_PKG_SOURCE_TYPE" = "ftp" ]; then -- cgit v1.2.3-54-g00ecf