From b1e24e03d847c8b67522d76e76ced3d14b1e23a6 Mon Sep 17 00:00:00 2001 From: Dieter Plaetinck Date: Fri, 31 Dec 2010 15:38:33 +0100 Subject: in show_report, support workers which havent been run and show them as such --- src/core/libs/lib-flowcontrol.sh | 7 +++++-- src/core/procedures/interactive | 7 +++++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/src/core/libs/lib-flowcontrol.sh b/src/core/libs/lib-flowcontrol.sh index ac7c8b0..e4d3df1 100755 --- a/src/core/libs/lib-flowcontrol.sh +++ b/src/core/libs/lib-flowcontrol.sh @@ -193,8 +193,11 @@ show_report () worker=${worker_str%% *} exit_var=exit_worker_$worker ret=${!exit_var} - [ "$ret" = "0" ] && data="$data\n > Worker $worker: Sucess" - [ "$ret" = "0" ] || data="$data\n > Worker $worker: Failed" + case "$ret" in + "") data="$data\n > Worker $worker: Skipped";; + "0") data="$data\n > Worker $worker: Sucess";; + *) data="$data\n > Worker $worker: Failed";; + esac done done inform "$data" diff --git a/src/core/procedures/interactive b/src/core/procedures/interactive index bfb13ff..d43c1fc 100644 --- a/src/core/procedures/interactive +++ b/src/core/procedures/interactive @@ -196,8 +196,11 @@ show_report () title=${workertitles[$w]} exit_var=exit_worker_$w ret=${!exit_var} - [ "$ret" = "0" ] && data="$data\n > Worker $worker ($title): Sucess" - [ "$ret" = "0" ] || data="$data\n > Worker $worker ($title): Failed" + case "$ret" in + "") data="$data\n > Worker $worker ($title): Skipped";; + "0") data="$data\n > Worker $worker ($title): Sucess";; + *) data="$data\n > Worker $worker ($title): Failed";; + esac done notify "$data\nIf the install finished successfully, you can type 'reboot' to restart the system." || return $? } -- cgit v1.2.3-54-g00ecf