=== modified file 'common.zsh' --- common.zsh 2017-12-13 01:09:04 +0000 +++ common.zsh 2017-12-13 01:01:40 +0000 @@ -208,9 +208,7 @@ out=$(sha256sum $1) || die "$0: Unable to checksum: ${(qqq)1}" __check_deps__+='if { test -e '${(qqq)1}$' }\n' __check_deps__+='if { pipeline -d { printf "%s\n" '${(qqq)out}$' } sha256sum -c }\n' - if (($# == 2)); then - setvar $2 ${out%% *} - fi + (($# == 2)) && setvar $2 ${out%% *} } dep_add_missing() { @@ -336,16 +334,16 @@ lift_vars[${arg%%=*}]=${arg#*=} done if (($+lift_vars[__unified__])); then - local args var + local names var fresh var=$last_var - for args in $lift_vars[__unified__]; do - for arg in $=args; do - if (($+lift[$arg])); then - unify $var $arg + for names in $lift_vars[__unified__]; do + for name in $=names; do + if (($+lift[$name])); then + unify $var $name fi - if (($+lift_vars[$arg])); then - setvar $var $lift_vars[$arg] + if (($+lift_vars[$name])); then + setvar $var $lift_vars[$name] fi done done === modified file 'functions/encode-args' --- functions/encode-args 2017-12-13 01:09:04 +0000 +++ functions/encode-args 2017-12-12 10:10:42 +0000 @@ -1,6 +1,5 @@ if (($#)); then base64 -w 0 <<<${(j::)${(oq)@}} | tr /+ _- | tr -d '=' - return $[ ${(j.|.)pipestatus} ] else echo -n '%' fi