From 8a689c99009a7b4533ffaad5cdbf299bc2929d15 Mon Sep 17 00:00:00 2001
From: t3chn0m4g3 <m.ochse@telekom.de>
Date: Tue, 21 Aug 2018 14:35:35 +0000
Subject: [PATCH] tweaking

---
 iso/installer/install.sh | 8 ++------
 update.sh                | 2 +-
 version                  | 2 +-
 3 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/iso/installer/install.sh b/iso/installer/install.sh
index 15d8679b..b2dca0e0 100755
--- a/iso/installer/install.sh
+++ b/iso/installer/install.sh
@@ -548,14 +548,10 @@ sed -i '/cdrom/d' /etc/apt/sources.list
 echo "UseRoaming no" 2>&1 | tee -a /etc/ssh/ssh_config | dialog --title "[ Turn SSH roaming off ]" $myPROGRESSBOXCONF
 
 # Installing ctop, elasticdump, tpot, yq
-if ! [ "$myCONF_TPOT_FLAVOR" == "SENSOR" ];
-  then
-    npm install https://github.com/taskrabbit/elasticsearch-dump#9fcc8cc -g 2>&1 | dialog --title "[ Installing elasticsearch-dump ]" $myPROGRESSBOXCONF
-fi
+npm install https://github.com/taskrabbit/elasticsearch-dump#9fcc8cc -g 2>&1 | dialog --title "[ Installing elasticsearch-dump ]" $myPROGRESSBOXCONF
 pip install --upgrade pip 2>&1 | dialog --title "[ Installing pip ]" $myPROGRESSBOXCONF
 hash -r 2>&1 | dialog --title "[ Installing pip ]" $myPROGRESSBOXCONF
-pip install elasticsearch-curator 2>&1 | dialog --title "[ Installing elasticsearch-curator ]" $myPROGRESSBOXCONF
-pip install yq 2>&1 | dialog --title "[ Installing yq ]" $myPROGRESSBOXCONF
+pip install elasticsearch-curator yq 2>&1 | dialog --title "[ Installing elasticsearch-curator, yq ]" $myPROGRESSBOXCONF
 wget https://github.com/bcicen/ctop/releases/download/v0.7.1/ctop-0.7.1-linux-amd64 -O /usr/bin/ctop 2>&1 | dialog --title "[ Installing ctop ]" $myPROGRESSBOXCONF
 chmod +x /usr/bin/ctop 2>&1 | dialog --title "[ Installing ctop ]" $myPROGRESSBOXCONF
 git clone https://github.com/dtag-dev-sec/tpotce -b 18.04 /opt/tpot 2>&1 | dialog --title "[ Cloning T-Pot ]" $myPROGRESSBOXCONF
diff --git a/update.sh b/update.sh
index b37b1fdb..5776b39a 100755
--- a/update.sh
+++ b/update.sh
@@ -82,7 +82,7 @@ function fuSELFUPDATE () {
 # Let's check for version
 function fuCHECK_VERSION () {
 local myMINVERSION="18.04.0"
-local myMASTERVERSION="18.04.0"
+local myMASTERVERSION="18.10.0"
 echo
 echo "### Checking for version tag ..."
 if [ -f "version" ];
diff --git a/version b/version
index 3d19f6ac..5036cb7c 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-18.04.0
+18.10.0