=== modified file 'common.zsh' --- common.zsh 2017-12-12 10:16:03 +0000 +++ common.zsh 2017-12-12 10:09:04 +0000 @@ -28,17 +28,13 @@ done } -decode_argstr() { - local base +decode_args() { + typeset -gA vars + local arg decoded base base=${BASE##*/} [[ $base == % || -n $base ]] && return - tr <<<$base _- /+ | base64 -d + decoded=$(tr <<<$base _- /+ | base64 -d) \ || die "Unable to decode: ${(qqq)base}" -} -decode_args() { - typeset -gA vars - local arg decoded - decoded=$(decode_argstr) (($#decoded)) || return for arg in "${(s::Q)decoded}"; do if [[ "$arg" != *=* ]]; then @@ -65,16 +61,15 @@ start-info(){ local name name=${${${DO:t}%.do}#default.} - info "entering: $name $(decode_argstr)" + info "entering: $name $(tr <<<${BASE##*/} _- /+ | base64 -d)" } finish-info(){ local name name=${${${DO:t}%.do}#default.} - info "finished: $name $(decode_argstr)" + info "finished: $name $(tr <<<${BASE##*/} _- /+ | base64 -d)" (($+vars[sha256sum])) && info "$name produced: $vars[sha256sum]" (($+vars[build_dir])) && info "$name build in: $vars[build_dir]" - (($+vars[filename])) && info "$name filename: $vars[filename]" } finish() {