From 0b64f2e86f26eb7fed687470ec316673ae624520 Mon Sep 17 00:00:00 2001
From: Antoine Jacoutot <antoine@mtier.org>
Date: Fri, 9 Aug 2013 11:44:30 +0200
Subject: [PATCH] Finalize auto-update. Bump version.

---
 openup | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/openup b/openup
index 9e12b1e..96e5ec7 100755
--- a/openup
+++ b/openup
@@ -53,7 +53,7 @@ if [ "${REL_INT}" -lt "${OPENUP_MINREL}" ]; then
 	error "XXX release ${REL[0]} is a no-no (non-fatal)"
 fi
 
-OPENUP_VERSION=1
+OPENUP_VERSION=2
 OPENUP_MINREL=53
 MEESA=$(readlink -f $0)
 TMPDIR="${TMPDIR:=/tmp}"
@@ -82,7 +82,7 @@ get_cert() {
 		split -p '^-----BEGIN CERTIFICATE-----$' /etc/ssl/pkgca.pem ${TMPSPLITCERT}
 
 	for i in ${TMPSPLITCERT}* ; do
-		openssl x509 -noout -in $i -fingerprint 2>/dev/null |
+		openssl x509 -noout -in $i -fingerprint 2>/dev/null | \
 			grep -q "${PKG_CERT_FPRINT}" && return
 	done
 
@@ -108,7 +108,7 @@ update_self() {
 	_CMD="ftp -Vo ${TMPUPD} ${OPENUP_URL}"
 	print2 "${_CMD}"
 	if [ -z "${DRYRUN}" ]; then
-		eval ${_CMD} # non-fatal
+		eval ${_CMD} || exit 1
 	fi
 
 	_N=$(grep -Eo '^OPENUP_VERSION=.*' ${TMPUPD} | awk -F '=' '{ print $2 }')
@@ -117,13 +117,13 @@ update_self() {
 			print3 "Updating openup(8) from version ${OPENUP_VERSION} to version ${_N}"
 			_CMD="cat ${TMPUPD} >${MEESA}"
 			print2 "${_CMD}"
-			eval ${_CMD} # non-fatal
-			if [ $? -eq 0 ]; then
-				# XXX
-				echo "successfully updated openup(8) to version ${_N}, restarting myself"
-				${MEESA} -U $@
-				exit $?
-			fi
+			eval ${_CMD} || exit 1
+			rtn=$?
+			print3 "openup(8) updated to version ${_N}, restarting"
+			_CMD="${MEESA} -U $@"
+			print2 "${_CMD}"
+			eval ${_CMD}
+			exit $rtn
 		fi
 }