From be12a24c2fec69f5b0f33c00763174d841ca26aa Mon Sep 17 00:00:00 2001
From: t3chn0m4g3 <t3chn0m4g3@gmail.com>
Date: Tue, 25 Oct 2016 23:33:20 +0200
Subject: [PATCH] tested and final: include installation type into installer...

it is finally possible to go without the ISO maker if you just want to try out a different T-Pot edition.
---
 installer/install.sh | 25 ++++++++++++++++++-------
 makeiso.sh           |  4 ----
 2 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/installer/install.sh b/installer/install.sh
index d32b7f5b..7206cb83 100755
--- a/installer/install.sh
+++ b/installer/install.sh
@@ -6,9 +6,6 @@
 # v16.10.0 by mo, DTAG, 2016-10-25                     #
 ########################################################
 
-# Type of install, TPOT, SENSOR, INDUSTRIAL or FULL?
-#myFLAVOR="TPOT"
-
 # Some global vars
 myPROXYFILEPATH="/root/tpot/etc/proxy"
 myNTPCONFPATH="/root/tpot/etc/ntp"
@@ -56,12 +53,26 @@ sleep 5
 # Install types are TPOT, HP, INDUSTRIAL, ALL
 while [ 1 != 2 ]
   do
-    fuECHO "### Please choose your install type."
+    fuECHO "### Please choose your install type and notice HW recommendation."
+    fuECHO "###"
+    fuECHO "### [T] - T-Pot Standard Installation"
+    fuECHO "###       > Cowrie, Dionaea, Elasticpot, Glastopf, Honeytrap, Suricata & ELK"
+    fuECHO "###       > 4 GB RAM (6-8 GB recommended)"
+    fuECHO "###       > 64GB disk (128 GB SSD recommended)"
+    fuECHO "###"
+    fuECHO "### [H] - Honeypots Only Installation"
+    fuECHO "###       > Cowrie, Dionaea, ElasticPot, Glastopf & Honeytrap"
+    fuECHO "###       > 3 GB RAM (4-6 GB recommended)"
+    fuECHO "###       > 64 GB disk (64 GB SSD recommended)"
+    fuECHO "###"
+    fuECHO "### [I] - Industrial"
+    fuECHO "###       > ConPot, eMobility, ELK & Suricata"
+    fuECHO "###       > 4 GB RAM (8 GB recommended)"
+    fuECHO "###       > 64 GB disk (128 GB SSD recommended)"
     fuECHO "###"
-    fuECHO "### [T] - T-Pot (Standard w/o Industrial)"
-    fuECHO "### [H] - Honeypots only (w/o Industrial)"
-    fuECHO "### [I] - Industrial (ConPot, eMobility, ELK, Suricata) (8GB RAM recommended)"
     fuECHO "### [E] - Everything (8GB RAM recommended)"
+    fuECHO "###       > 8 GB RAM"
+    fuECHO "###       > 128 GB disk or larger (128 GB SSD or larger recommended)"
     fuECHO "###"
     read -p "Install Type: " myTYPE
     case "$myTYPE" in
diff --git a/makeiso.sh b/makeiso.sh
index 9aa75a80..c5737c7e 100755
--- a/makeiso.sh
+++ b/makeiso.sh
@@ -89,10 +89,6 @@ if [ "$mySTART" = "1" ];
     exit
 fi
 
-# Let's ask for the type of installation?
-#myFLAVOR=$(dialog --no-cancel --backtitle "$myBACKTITLE" --title "[ Installation type ... ]" --radiolist "" 11 76 4 "TPOT" "Standard (w/o INDUSTRIAL)" on "HP" "Honeypots only (w/o INDUSTRIAL)" off "INDUSTRIAL" "ConPot, eMobility, ELK, Suricata (8GB RAM recommended)" off "ALL" "Everything (8GB RAM required)" off 3>&1 1>&2 2>&3 3>&-)
-#sed -i 's#^myFLAVOR=.*#myFLAVOR="'$myFLAVOR'"#' $myINSTALLERPATH
-
 # Let's ask the user for a proxy ...
 while true;
 do