prepare for merge to master

iso/installer/install.sh

@@ -268,11 +268,6 @@ function fuGET_DEPS {
   echo "### Determine fastest mirror for your location."
   echo
   netselect-apt -n -a amd64 unstable && cp sources.list /etc/apt/
-#  # Point to Debian (Sid, unstable)
-#  tee /etc/apt/sources.list <<EOF
-#deb http://deb.debian.org/debian unstable main contrib non-free
-#deb-src http://deb.debian.org/debian unstable main contrib non-free
-#EOF
   echo
   echo "### Getting update information."
   echo
@@ -658,7 +653,7 @@ pip install elasticsearch-curator yq
 
 # Cloning T-Pot from GitHub
 fuBANNER "Cloning T-Pot"
-git clone https://github.com/dtag-dev-sec/tpotce -b debian /opt/tpot
+git clone https://github.com/dtag-dev-sec/tpotce /opt/tpot
 
 # Let's create the T-Pot user
 fuBANNER "Create user"

iso/preseed/tpot.seed

@@ -131,7 +131,7 @@ in-target apt-get -y install grub-pc; \
 in-target grub-install --force $(debconf-get partman-auto/disk); \
 update-dev; \
 in-target update-grub; \
-in-target git clone --depth=1 https://github.com/dtag-dev-sec/tpotce -b debian /opt/tpot; \
+in-target git clone --depth=1 https://github.com/dtag-dev-sec/tpotce /opt/tpot; \
 in-target sed -i 's/allow-hotplug/auto/g' /etc/network/interfaces; \
 #in-target apt-get -y remove exim4-base; \
 #in-target apt-get -y autoremove; \

update.sh

@@ -58,7 +58,7 @@ function fuSELFUPDATE () {
       echo "###### $myBLUE""No updates found in repository.""$myWHITE"
       return
   fi
-  myRESULT=$(git diff --name-only origin/debian | grep update.sh)
+  myRESULT=$(git diff --name-only origin/master | grep update.sh)
   if [ "$myRESULT" == "update.sh" ];
     then
       echo "###### $myBLUE""Found newer version, will be pulling updates and restart myself.""$myWHITE"