From a584d9869e9a7e48bf2b2e38c1f9baf5f9bfc871 Mon Sep 17 00:00:00 2001
From: Marco Ochse <t3chn0m4g3@gmail.com>
Date: Thu, 5 Oct 2017 22:53:35 +0000
Subject: [PATCH] prepare for merge

autoupdate is functional as far as the test branch can tell
---
 update.sh | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/update.sh b/update.sh
index 1266b8a5..30767342 100755
--- a/update.sh
+++ b/update.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-### test 2
+
 ###################################################
 # Do not change any contents of this script!
 ###################################################
@@ -20,8 +20,6 @@ if [ "$myWHOAMI" != "root" ]
     exit
 fi
 
-echo "#############>>>>>> I just got updated WOOT"
-
 # Check for existing tpot.yml
 function fuCONFIGCHECK () {
   echo "### Checking for T-Pot configuration file ..."
@@ -68,7 +66,7 @@ function fuSELFUPDATE () {
       echo "###### $myBLUE"No updates found in repository."$myWHITE"
       return
   fi
-  myRESULT=$(git diff --name-only origin/autoupdate | grep update.sh)
+  myRESULT=$(git diff --name-only origin/17.06 | grep update.sh)
   myLOCALSTAT=$(git status -uno | grep -c update.sh)
   if [ "$myRESULT" == "update.sh" ];
     then