=== modified file 'bin/confz' --- bin/confz 2014-06-28 03:45:58 +0000 +++ bin/confz 2014-06-28 02:45:48 +0000 @@ -20,22 +20,22 @@ # trace-printing helpers confz_check_start() { - print -r - "${confz_indent}checking $fg_bold[default]$1$reset_color ${(@q)argv[2,-1]} ${reset_color}[" >&2 + print -r - "${confz_indent}checking $fg_bold[default]$1$reset_color ${(@q)argv[2,-1]} ${reset_color}[" confz_indent+=" " } confz_check_ok() { confz_indent=${confz_indent% } - print -r - "$confz_indent] $fg[green]$1$reset_color OK" >&2 + print -r - "$confz_indent] $fg[green]$1$reset_color OK" } confz_check_fail() { confz_indent=${confz_indent% } - print -P "$confz_indent] $fg[yellow]$1$reset_color FAIL" >&2 + print -P "$confz_indent] $fg[yellow]$1$reset_color FAIL" } confz_do() { - print -r - "$confz_indent$fg[yellow]*$fg[default] ${(q)@}" >&2 + print -r - "$confz_indent$fg[yellow]*$fg[default] ${(q)@}" actions_performed+=( "$*" ) "$@" || die "command failed with error $?: ${(q)@}" } @@ -43,7 +43,7 @@ # trace-printing helper for setting $vars values setvar() { if (($verbose)); then - print -r - "$confz_indent$fg[cyan]$1$fg[default]=${(qqq)2}" >&2 + print -r - "$confz_indent$fg[cyan]$1$fg[default]=${(qqq)2}" fi vars[$1]=$2 } === modified file 'zsh-functions/confz_postgresql_init' --- zsh-functions/confz_postgresql_init 2014-06-28 03:45:58 +0000 +++ zsh-functions/confz_postgresql_init 2014-06-28 03:40:59 +0000 @@ -13,7 +13,7 @@ fi if ! [[ -e $dst ]]; then - confz_do mv "$1" "$dst" + mv $1 $dst return $? fi @@ -27,7 +27,7 @@ (( $n > 9999 )) && die "can not config-protect $dst:t/$base" done - confz_do mv "$1" "$dst" + mv $1 $dst } confz_postgresql_cluster_check() { @@ -42,16 +42,16 @@ } confz_postgresql_cluster_do() { - confz_do mkdir -p $vars[data_dir] $vars[pgdata] || return $? - confz_do chown -Rf $vars[owner]: $vars[data_dir] || return $? - confz_do chmod 0700 $vars[data_dir] || return $? - confz_do su $vars[owner] -c "$vars[initdb] -L ${(qqq)vars[locale]} -D ${(qqq)vars[data_dir]} $vars[initdb_opts]" || return $? + mkdir -p $vars[data_dir] $vars[pgdata] || return $? + chown -Rf $vars[owner]: $vars[data_dir] || return $? + chmod 0700 $vars[data_dir] || return $? + su $vars[owner] -c "$vars[initdb] -L ${(qqq)vars[locale]} -D ${(qqq)vars[data_dir]} $vars[initdb_opts]" || return $? local cfg if ! [[ $vars[data_dir] == $vars[pgdata] ]]; then for cfg in $vars[data_dir]/*.conf(N); do - confz_do config-protect-mv $cfg $vars[pgdata]/ + config-protect-mv $cfg $vars[pgdata]/ done fi @@ -113,7 +113,7 @@ (($+vars[host])) && opts+=( --host=$vars[host] ) (($+vars[port])) && opts+=( --port=$vars[port] ) - out=$( confz_do $psql $opts -AP tuples_only=on -c '\d' $vars[db] ) || die "psql failed" + out=$( $psql $opts -AP tuples_only=on -c '\d' $vars[db] ) || die "psql failed" if [[ -z $out ]]; then fail_reason="the schema for ${(qqq)db} is empty" return 1 @@ -131,5 +131,5 @@ (($+vars[host])) && opts+=( --host=$vars[host] ) (($+vars[port])) && opts+=( --port=$vars[port] ) - confz_do $psql $opts -1 $vars[db] -f - <<<$vars[psql_input] + $psql $opts -1 $vars[db] -f - <<<$vars[psql_input] }