confz

commit f855a5d60705b0dc1ef7c5324aa086074319483f
parent 331d4ce549c9b3ec5b7a563988b3ad895dbe1d38
Author: Jan Pobrislo <ccx@webprojekty.cz>
Date:   Sat, 28 Jun 2014 05:45:58 +0200

use confz_do to annotate actions performed
Diffstat:
M
bin/confz
 | 
10
+++++-----
M
zsh-functions/confz_postgresql_init
 | 
18
+++++++++---------

2 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/bin/confz b/bin/confz
@@ -20,22 +20,22 @@ die() {
 
 # trace-printing helpers
 confz_check_start() {
-	print -r - "${confz_indent}checking $fg_bold[default]$1$reset_color ${(@q)argv[2,-1]} ${reset_color}["
+	print -r - "${confz_indent}checking $fg_bold[default]$1$reset_color ${(@q)argv[2,-1]} ${reset_color}[" >&2
 	confz_indent+=" "
 }
 
 confz_check_ok() {
 	confz_indent=${confz_indent% }
-	print -r - "$confz_indent] $fg[green]$1$reset_color OK"
+	print -r - "$confz_indent] $fg[green]$1$reset_color OK" >&2
 }
 
 confz_check_fail() {
 	confz_indent=${confz_indent% }
-	print -P "$confz_indent] $fg[yellow]$1$reset_color FAIL"
+	print -P "$confz_indent] $fg[yellow]$1$reset_color FAIL" >&2
 }
 
 confz_do() {
-	print -r - "$confz_indent$fg[yellow]*$fg[default] ${(q)@}"
+	print -r - "$confz_indent$fg[yellow]*$fg[default] ${(q)@}" >&2
 	actions_performed+=( "$*" )
 	"$@" || die "command failed with error $?: ${(q)@}"
 }
@@ -43,7 +43,7 @@ confz_do() {
 # trace-printing helper for setting $vars values
 setvar() {
 	if (($verbose)); then
-		print -r - "$confz_indent$fg[cyan]$1$fg[default]=${(qqq)2}"
+		print -r - "$confz_indent$fg[cyan]$1$fg[default]=${(qqq)2}" >&2
 	fi
 	vars[$1]=$2
 }
diff --git a/zsh-functions/confz_postgresql_init b/zsh-functions/confz_postgresql_init
@@ -13,7 +13,7 @@ config-protect-mv() {
 	fi
 
 	if ! [[ -e $dst ]]; then
-		mv $1 $dst
+		confz_do mv "$1" "$dst"
 		return $?
 	fi
 
@@ -27,7 +27,7 @@ config-protect-mv() {
 		(( $n > 9999 )) && die "can not config-protect $dst:t/$base"
 	done
 
-	mv $1 $dst
+	confz_do mv "$1" "$dst"
 }
 
 confz_postgresql_cluster_check() {
@@ -42,16 +42,16 @@ confz_postgresql_cluster_check() {
 }
 
 confz_postgresql_cluster_do() {
-	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 $?
+	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 $?
 
 	local cfg
 
 	if !  [[ $vars[data_dir] == $vars[pgdata] ]]; then
 		for cfg in $vars[data_dir]/*.conf(N); do
-			config-protect-mv $cfg $vars[pgdata]/
+			confz_do config-protect-mv $cfg $vars[pgdata]/
 		done
 	fi
 
@@ -113,7 +113,7 @@ confz_postgresql_schema_check() {
 	(($+vars[host])) && opts+=( --host=$vars[host] )
 	(($+vars[port])) && opts+=( --port=$vars[port] )
 
-	out=$( $psql $opts -AP tuples_only=on -c '\d' $vars[db] ) || die "psql failed"
+	out=$( confz_do $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 @@ confz_postgresql_schema_do() {
 	(($+vars[host])) && opts+=( --host=$vars[host] )
 	(($+vars[port])) && opts+=( --port=$vars[port] )
 
-	$psql $opts -1 $vars[db] -f - <<<$vars[psql_input]
+	confz_do $psql $opts -1 $vars[db] -f - <<<$vars[psql_input]
 }