From f767c829e4390823cb85bbee286c4e21cfa44f95 Mon Sep 17 00:00:00 2001
From: Marco Ochse <t3chn0m4g3@gmail.com>
Date: Wed, 10 Jan 2018 17:29:02 +0000
Subject: [PATCH] tweak update script

---
 update.sh | 58 +++++++++++++++++++++++++++----------------------------
 1 file changed, 29 insertions(+), 29 deletions(-)

diff --git a/update.sh b/update.sh
index 5db67b46..db301ea0 100755
--- a/update.sh
+++ b/update.sh
@@ -85,36 +85,7 @@ function fuSELFUPDATE () {
       fi
     else
       echo "###### Update script is already up-to-date."
-
-      # Better safe than sorry
-      echo "###### Creating backup and storing it in /home/tsec"
-      tar cvfz /home/tsec/tpot_backup.tgz /opt/tpot
-
-      echo "###### Pulling updates"
       git pull --force
-
-      echo "###### Getting the current install flavor"
-      myFLAVOR=$(head $myCONFIGFILE -n 1 | awk '{ print $3 }' | tr -d :'()':)
-
-      echo "###### Updating compose file"
-      case $myFLAVOR in
-        HP)
-          echo "###### Restoring HONEYPOT flavor installation."
-          cp $myCOMPOSEPATH/hp.yml $myCONFIGFILE
-        ;;
-        Industrial)
-          echo "###### Restoring INDUSTRIAL flavor installation."
-          cp $myCOMPOSEPATH/industrial.yml $myCONFIGFILE
-        ;;
-        Standard)
-          echo "###### Restoring TPOT flavor installation."
-          cp $myCOMPOSEPATH/tpot.yml $myCONFIGFILE
-        ;;
-        Everything)
-          echo "###### Restoring EVERYTHING flavor installation."
-          cp $myCOMPOSEPATH/all.yml $myCONFIGFILE
-        ;;
-      esac
   fi
 }
 
@@ -142,6 +113,33 @@ echo
 echo "### Now stopping T-Pot"
 systemctl stop tpot
 
+# Better safe than sorry
+echo "###### Creating backup and storing it in /home/tsec"
+tar cvfz /home/tsec/tpot_backup.tgz /opt/tpot
+
+echo "###### Getting the current install flavor"
+myFLAVOR=$(head $myCONFIGFILE -n 1 | awk '{ print $3 }' | tr -d :'()':)
+
+echo "###### Updating compose file"
+case $myFLAVOR in
+  HP)
+    echo "###### Restoring HONEYPOT flavor installation."
+    cp $myCOMPOSEPATH/hp.yml $myCONFIGFILE
+  ;;
+  Industrial)
+    echo "###### Restoring INDUSTRIAL flavor installation."
+    cp $myCOMPOSEPATH/industrial.yml $myCONFIGFILE
+  ;;
+  Standard)
+    echo "###### Restoring TPOT flavor installation."
+    cp $myCOMPOSEPATH/tpot.yml $myCONFIGFILE
+  ;;
+  Everything)
+    echo "###### Restoring EVERYTHING flavor installation."
+    cp $myCOMPOSEPATH/all.yml $myCONFIGFILE
+  ;;
+esac
+
 echo
 echo "### Now upgrading packages"
 apt-get autoclean -y
@@ -185,4 +183,6 @@ echo "### Now starting T-Pot service"
 systemctl start tpot
 
 echo
+echo "### If you made changes to tpot.yml please ensure to add them again."
+echo "### We stored the previous version as backup in /home/tsec."
 echo "### Done."