From 457b275800ed1bb33b76cd58496eedd0a1add749 Mon Sep 17 00:00:00 2001
From: ttasket <tasket@openmailbox.org>
Date: Mon, 20 Jun 2016 13:36:30 -0400
Subject: [PATCH] Fix syntax

@marmarek This works on my system.
---
 dom0-updates/qubes-dom0-update | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/dom0-updates/qubes-dom0-update b/dom0-updates/qubes-dom0-update
index 477a929..f804d76 100755
--- a/dom0-updates/qubes-dom0-update
+++ b/dom0-updates/qubes-dom0-update
@@ -71,9 +71,13 @@ if [ "$YUM_ACTION" == "reinstall" ] && [[ "$PKGS" == *"qubes-template-"* ]]; the
     if [[ "$ONEPKG" == "qubes-template-"* ]] && [[ "$ONEPKG" == "${PKGS#\ }" ]]; then # test "$PKGS" minus space
     # Prepare to backup template root.img in case reinstall doesn't complete.
         TEMPLATE=${ONEPKG#qubes-template-}
-        TEMPLATE_NETVM=`qvm-prefs --force-root $TEMPLATE netvm` || exit 1
-        [[ "$TEMPLATE_NETVM" == *"(default)" ]] && TEMPLATE_NETVM="default"
-        BAK_TEMPLATE_ROOT=`qvm-prefs --force-root $TEMPLATE root_img` || exit 1
+        if ! TEMPLATE_NETVM=`qvm-prefs --force-root $TEMPLATE netvm` \
+        || ! BAK_TEMPLATE_ROOT=`qvm-prefs --force-root $TEMPLATE root_img` ; then
+            exit 1
+        fi
+        if [[ "$TEMPLATE_NETVM" == *"(default)" ]] ; then
+            TEMPLATE_NETVM="default"
+        fi
     else
         echo "ERROR: Specify only one package to reinstall template"
         exit 1
@@ -181,11 +185,9 @@ fi
 if [ "x$PKGS" != "x" ]; then
     if [[ -n "$BAK_TEMPLATE_ROOT" ]] ; then
     # Backup root.img just in case
-        echo -n "Renaming template root.img to root.img-bak..."
         if mv "$BAK_TEMPLATE_ROOT" "$BAK_TEMPLATE_ROOT-bak" ; then
-            echo "OK"
+            echo "Renamed template root.img to root.img-bak"
         else
-            echo; echo "ERROR: Could not rename root.img"
             exit 1
         fi
     fi
@@ -195,7 +197,7 @@ if [ "x$PKGS" != "x" ]; then
     if [[ -n "$BAK_TEMPLATE_ROOT" ]] ; then
         qvm-prefs --force-root -s $TEMPLATE netvm $TEMPLATE_NETVM
         if [ $RETCODE -eq 0 ] ; then
-        # Reinstall went OK, remove backup file.
+        # Reinstall went OK, remove backup files.
             echo "Removing $BAK_TEMPLATE_ROOT-bak"
             rm -f "$BAK_TEMPLATE_ROOT-bak"
         fi