diff options
| author | Dieter Plaetinck <dieter@plaetinck.be> | 2008-11-09 23:43:13 +0100 |
|---|---|---|
| committer | Dieter Plaetinck <dieter@plaetinck.be> | 2008-11-09 23:43:13 +0100 |
| commit | f1a1d90a0bce8c3fbaceee9dcc718522a2dc306e (patch) | |
| tree | 26a856ddd5bba15c3e0274f35207a7b5acd842cc | |
| parent | f1f606578ecfdf92f788531b6de065f211e2869e (diff) | |
return value assignment bugfix
| -rw-r--r-- | src/core/procedures/interactive | 2 | ||||
| -rwxr-xr-x | src/fifa.sh | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/core/procedures/interactive b/src/core/procedures/interactive index 3bc8ee4..65a4b28 100644 --- a/src/core/procedures/interactive +++ b/src/core/procedures/interactive @@ -91,7 +91,7 @@ mainmenu() "1") execute worker set_clock && S_CLOCK=1 ;; "2") - execute worker prepare_disks ;; # stage set vars set in the worker + execute worker prepare_disks ;; # stage set vars set in the worker #TODO: when this is done, default next item is clock? "3") execute worker package_list && S_SELECT=1 ;; "4") diff --git a/src/fifa.sh b/src/fifa.sh index 0812902..df6bd76 100755 --- a/src/fifa.sh +++ b/src/fifa.sh @@ -130,7 +130,7 @@ execute () do execute worker $worker_str || read $exit_var <<< $? # assign last failing exit code to exit_phase_<phasename>, if any. done - ret={!exit_var} + ret=${!exit_var} fi cd $PWD_BACKUP @@ -167,7 +167,7 @@ show_report () #TODO: abstract UI method (cli/dia) do object=phase_$phase exit_var=exit_$object - ret={!exit_var} + ret=${!exit_var} echo -n "Phase $phase: " [ "$ret" = "0" ] && echo "Success" || echo "Failed" eval phase_array=$(declare | grep -e "^${object}=" | cut -d"=" -f 2-) @@ -175,7 +175,7 @@ show_report () #TODO: abstract UI method (cli/dia) do worker=${worker_str%% *} exit_var=exit_worker_$worker - ret={!exit_var} + ret=${!exit_var} echo -n " > Worker $worker: " [ "$ret" = "0" ] && echo "Success" || echo "Failed" done |