From 66c83d3b34238812e6f3b6606905203097cbc9c0 Mon Sep 17 00:00:00 2001
From: Antoine Jacoutot <antoine@mtier.org>
Date: Fri, 9 Aug 2013 11:26:55 +0200
Subject: [PATCH] Add printf(1) functions.

---
 openup | 34 +++++++++++++++++++---------------
 1 file changed, 19 insertions(+), 15 deletions(-)

diff --git a/openup b/openup
index 656553b..9e12b1e 100755
--- a/openup
+++ b/openup
@@ -67,10 +67,14 @@ error() {
 	echo -n "*** ERROR: $@"
 }
 
-print_action() {
+print3() {
 	echo "===> ${@}${DRYRUN}"
 }
 
+print2() {
+	echo "==> ${@}"
+}
+
 get_cert() {
 	local _CMD
 
@@ -82,16 +86,16 @@ get_cert() {
 			grep -q "${PKG_CERT_FPRINT}" && return
 	done
 
-	print_action "Downloading certificate"
+	print3 "Downloading certificate"
 	_CMD="ftp -Vo ${TMPCERT} ${PKG_CERT_URL}"
-	echo "==> ${_CMD}"
+	print2 "${_CMD}"
 	if [ -z "${DRYRUN}" ]; then
 		eval ${_CMD} || exit 1
 	fi
 
-	print_action "Installing certificate"
+	print3 "Installing certificate"
 	_CMD="cat ${TMPCERT} >>/etc/ssl/pkgca.pem"
-	echo "==> ${_CMD}"
+	print2 "${_CMD}"
 	if [ -z "${DRYRUN}" ]; then
 		eval ${_CMD} || exit 1
 	fi
@@ -100,9 +104,9 @@ get_cert() {
 update_self() {
 	local _CMD _N
 
-	print_action "Checking for openup(8) update"
+	print3 "Checking for openup(8) update"
 	_CMD="ftp -Vo ${TMPUPD} ${OPENUP_URL}"
-	echo "==> ${_CMD}"
+	print2 "${_CMD}"
 	if [ -z "${DRYRUN}" ]; then
 		eval ${_CMD} # non-fatal
 	fi
@@ -110,9 +114,9 @@ update_self() {
 	_N=$(grep -Eo '^OPENUP_VERSION=.*' ${TMPUPD} | awk -F '=' '{ print $2 }')
 	[[ -n "${_N}" ]] && \
 		if [ "${OPENUP_VERSION}" -lt "${_N}" ]; then
-			print_action "Updating openup(8) from version ${OPENUP_VERSION} to version ${_N}"
+			print3 "Updating openup(8) from version ${OPENUP_VERSION} to version ${_N}"
 			_CMD="cat ${TMPUPD} >${MEESA}"
-			echo "==> ${_CMD}"
+			print2 "${_CMD}"
 			eval ${_CMD} # non-fatal
 			if [ $? -eq 0 ]; then
 				# XXX
@@ -129,9 +133,9 @@ update_binpatches() {
 	_BP=$(pkg_info -Q binpatch${REL_INT}-$(arch -s) | sed 's/.[^-]*$//' | sort -u | tr '\n' ' ')
 
 	if [ -n "$_BP" ]; then
-		print_action "Updating binpatch(es)"
+		print3 "Updating binpatch(es)"
 		_CMD="pkg_add ${pkg_opt} ${_BP}"
-		echo "==> ${_CMD}"
+		print2 "${_CMD}"
 		eval ${_CMD}
 	fi
 }
@@ -139,18 +143,18 @@ update_binpatches() {
 update_pkg() {
 	local _CMD
 
-	print_action "Updating package(s)"
+	print3 "Updating package(s)"
 	_CMD="pkg_add -u ${pkg_opt}"
-	echo "==> ${_CMD}"
+	print2 "${_CMD}"
 	eval ${_CMD}
 }
 
 update_fw() {
 	local _CMD
 
-	print_action "Updating firmware(s)"
+	print3 "Updating firmware(s)"
 	_CMD="fw_update ${fw_opt}"
-	echo "==> ${_CMD}"
+	print2 "${_CMD}"
 	eval ${_CMD}
 }