commit 8f3ad6845e27fcd058ad418c75621404646632c4 parent 6192400db85641235eb44ddb37f99302663ab0f7 Author: Jan Pobrislo <ccx@webprojekty.cz> Date: Thu, 19 Jun 2014 20:33:35 +0200 remove superfluous check Diffstat:
| M | bin/confz | | | 31 | +++++++++++++++++-------------- |
1 file changed, 17 insertions(+), 14 deletions(-)
diff --git a/bin/confz b/bin/confz @@ -128,32 +128,35 @@ require() { do_command_prev=( "${do_command[@]}" ) do_command=( confz_${name}_do ) - # perform check & run - if ! (($check_only)); then - if confz_${name}_check "$@"; then - confz_check_ok $name + # perform check - run - check + if confz_${name}_check "$@"; then + confz_check_ok $name + else + if (($check_only)); then + die "$name: check failed with error $?" else confz_check_fail $name confz_do "${do_command[@]}" "$@" + + # print check start + confz_check_start $name "$@" "(again)" + + # perform check once again + check_only_prev=$check_only + check_only=1 + confz_${name}_check "$@" || die "$name: check failed with error $?" + confz_check_ok $name + check_only=$check_only_prev fi - - # print check start - confz_check_start $name "$@" fi - # perform check once again - check_only_prev=$check_only - check_only=1 - confz_${name}_check "$@" || die "$name: check failed with error $?" - confz_check_ok $name - check_only=$check_only_prev # restore $do_command do_command=( "${do_command_prev[@]}" ) # restore old $vars and put calee's $vars into $vars_prev vars_prev=( "${(@kv)vars}" ) - vars=( "${(kv)vars_local[@]}" ) + vars=( "${(@kv)vars_local}" ) # lift %variables from calee to caller for outer inner in ${(kv)lift}; do