From 65679f839e6b7f1a136d1e7359fc67a029cae717 Mon Sep 17 00:00:00 2001 From: Dieter Plaetinck Date: Wed, 29 Dec 2010 16:38:21 +0100 Subject: refactor select_source,networking workers * give base/automatic procedures more elegant select_source, runtime_network workers * make select_mirrors part of select_source, no need to have it a worker * "select source" extras (including runtime_network and interactive_select_mirror) are specific to the interactive procedure, so make it part of interactive's select_source worker. * interactive worker_select_source has no problems being run multiple times --- src/core/libs/lib-ui-interactive.sh | 18 ------------------ 1 file changed, 18 deletions(-) (limited to 'src/core/libs') diff --git a/src/core/libs/lib-ui-interactive.sh b/src/core/libs/lib-ui-interactive.sh index 93e5bae..329ef5d 100644 --- a/src/core/libs/lib-ui-interactive.sh +++ b/src/core/libs/lib-ui-interactive.sh @@ -1212,7 +1212,6 @@ EOF } -# select_source(). taken from setup. # displays installation source selection menu # and sets up relevant config files # @@ -1249,9 +1248,7 @@ interactive_select_source() } -# select_mirror(). taken from setup. # Prompt user for preferred mirror and set $var_SYNC_URL -# # args: none # returns: nothing interactive_select_mirror() { @@ -1271,18 +1268,3 @@ interactive_select_mirror() { fi echo "Using mirror: $var_SYNC_URL" >$LOG } - -select_source_extras_menu () -{ - while true; do - default=no - [ -n "$NEXTITEM" ] && default="$NEXTITEM" - 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" "$worker_runtime_network_title" \ - "2" "$worker_select_mirror_title" \ - "3" "Return to Main Menu" || return 1 - [ "$ANSWER_OPTION" = 1 ] && execute worker runtime_network && NEXTITEM=2 - [ "$ANSWER_OPTION" = 2 ] && execute worker select_mirror && NEXTITEM=3 - [ "$ANSWER_OPTION" = 3 ] && break - done -} -- cgit v1.2.3-54-g00ecf