From a47ca846fa9e53ae3c941133beb815feba415175 Mon Sep 17 00:00:00 2001
From: teastep <teastep@fbd18981-670d-0410-9b5c-8dc0c1a9a2bb>
Date: Wed, 14 Sep 2005 18:36:55 +0000
Subject: [PATCH] Finish install/fallback cleanup -- take 3

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@2682 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
---
 Shorewall/fallback.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Shorewall/fallback.sh b/Shorewall/fallback.sh
index 48d601cb0..6df734c69 100755
--- a/Shorewall/fallback.sh
+++ b/Shorewall/fallback.sh
@@ -39,9 +39,10 @@ usage() # $1 = exit status
 restore_directory() # $1 = directory to restore
 {
     if [ -d ${1}-${VERSION}.bkout ]; then
-	if mv -f $1 ${1}-${VERSION} && mv ${1}-${VERSION}.bkout $1 && rm -rf ${1}-${VERSION}; then
+	if mv -f $1 ${1}-${VERSION} && mv ${1}-${VERSION}.bkout $1; then
 	    echo
 	    echo "$1 restored"
+	    rm -rf ${1}-${VERSION}
 	else
 	    echo "ERROR: Could not restore $1"
 	    exit 1