From e6b5746203c18b1c2e935a9a714909ad7e92e5f6 Mon Sep 17 00:00:00 2001 From: Dieter Plaetinck Date: Thu, 3 Mar 2011 19:31:48 +0100 Subject: be more strict and correct in worker exit codes --- src/core/procedures/interactive | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'src/core/procedures/interactive') diff --git a/src/core/procedures/interactive b/src/core/procedures/interactive index 40021ef..0148389 100644 --- a/src/core/procedures/interactive +++ b/src/core/procedures/interactive @@ -86,8 +86,7 @@ worker_configure_system() worker_prepare_disks() { - get_possible_fs - interactive_prepare_disks + get_possible_fs && interactive_prepare_disks } @@ -111,9 +110,11 @@ select_source_extras_menu () "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 + case $ANSWER_OPTION in + "1") execute worker runtime_network && default=2 || return 1 ;; + "2") interactive_select_mirror && default=3 || return 1 ;; + "3") break ;; + esac done return 0 } -- cgit v1.2.3-54-g00ecf