From 4505c84d5f0976fb86ef226d0b78b4c9e2ff9306 Mon Sep 17 00:00:00 2001
From: Steven <steven@teamg.be>
Date: Fri, 5 Mar 2021 20:33:45 +0100
Subject: [PATCH] Download wget, remove tty from script

---
 web/Dockerfile             | 2 +-
 web/INSTALL_NODB.sh        | 5 -----
 web/INSTALL_NODB.sh.sha1   | 2 +-
 web/INSTALL_NODB.sh.sha256 | 2 +-
 web/INSTALL_NODB.sh.sha384 | 2 +-
 web/INSTALL_NODB.sh.sha512 | 2 +-
 6 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/web/Dockerfile b/web/Dockerfile
index c850b08..dd77772 100644
--- a/web/Dockerfile
+++ b/web/Dockerfile
@@ -8,7 +8,7 @@ RUN apt-get update && \
     apt-get dist-upgrade -y && apt-get autoremove -y && apt-get clean && \
     apt-get install -y software-properties-common && \
     apt-get install -y postfix && \
-    apt-get install -y mysql-client curl gcc git gnupg-agent \
+    apt-get install -y mysql-client wget curl gcc git gnupg-agent \
         make python openssl redis-server sudo vim zip locales
 
 RUN locale-gen en_US.UTF-8
diff --git a/web/INSTALL_NODB.sh b/web/INSTALL_NODB.sh
index 590b45e..3a65211 100755
--- a/web/INSTALL_NODB.sh
+++ b/web/INSTALL_NODB.sh
@@ -184,7 +184,6 @@ usage () {
     SCRIPT_NAME=$0
   fi
 
-  exec &> /dev/tty
   space
   echo -e "Please specify what type of ${LBLUE}MISP${NC} setup you want to install."
   space
@@ -784,7 +783,6 @@ kaliUpgrade () {
 
 # Disables sleep
 disableSleep () {
-  debug "Disabling sleep etc if run from a Laptop as the install might take some time…" > /dev/tty
   gsettings set org.gnome.settings-daemon.plugins.power sleep-inactive-ac-timeout 0 2> /dev/null
   gsettings set org.gnome.settings-daemon.plugins.power sleep-inactive-battery-timeout 0 2> /dev/null
   gsettings set org.gnome.settings-daemon.plugins.power sleep-inactive-battery-type nothing 2> /dev/null
@@ -811,7 +809,6 @@ checkAptLock () {
   fi
   while [ "$DONE" != "0" ]; do
     sudo apt-get check 2> /dev/null > /dev/null && DONE=0
-    echo -e "${LBLUE}apt${NC} is maybe ${RED}locked${NC}, waiting ${RED}$SLEEP${NC} seconds." > /dev/tty
     sleep $SLEEP
     SLEEP=$[$SLEEP+3]
   done
@@ -2622,10 +2619,8 @@ generateInstaller () {
 # Make sure no alias exists
 [[ $(type -t debug) == "alias" ]] && unalias debug
 debug () {
-  echo -e "${RED}Next step:${NC} ${GREEN}$1${NC}" > /dev/tty
   if [[ ! -z ${DEBUG} ]]; then
     NO_PROGRESS=1
-    echo -e "${RED}Debug Mode${NC}, press ${LBLUE}enter${NC} to continue..." > /dev/tty
     exec 3>&1
     read
   else
diff --git a/web/INSTALL_NODB.sh.sha1 b/web/INSTALL_NODB.sh.sha1
index e1de745..e731e16 100644
--- a/web/INSTALL_NODB.sh.sha1
+++ b/web/INSTALL_NODB.sh.sha1
@@ -1 +1 @@
-ab0a75b84ba34290ae16109dd9423aa6ff4e61cd  INSTALL_NODB.sh
+a49d5521f405d20fc3dea76ee995e067d01c5c2c  INSTALL_NODB.sh
diff --git a/web/INSTALL_NODB.sh.sha256 b/web/INSTALL_NODB.sh.sha256
index 2aa0557..5d8ff86 100644
--- a/web/INSTALL_NODB.sh.sha256
+++ b/web/INSTALL_NODB.sh.sha256
@@ -1 +1 @@
-5ff074e22636b57cb6ee5a5b363460b6131a57c72c272c85816f9abeee69dc9b  INSTALL_NODB.sh
+8660be136c0127091888ef38a71eb551dba5fe4e0a2d4f53b5b9479a675da6b1  INSTALL_NODB.sh
diff --git a/web/INSTALL_NODB.sh.sha384 b/web/INSTALL_NODB.sh.sha384
index f719255..6ed8525 100644
--- a/web/INSTALL_NODB.sh.sha384
+++ b/web/INSTALL_NODB.sh.sha384
@@ -1 +1 @@
-c89ec379d9d1b6ce87d1ea18a52406f1327a2b0ec04155243bba1e5934581f8aa7d825aebfa3b247f7e73b8a5814bc61  INSTALL_NODB.sh
+03b5185082c6d77184520214cf2c263fd46068109c8972ede393b6bd0d99a30e7552ee6e70de5c87f9aea5ba41cd5f9f  INSTALL_NODB.sh
diff --git a/web/INSTALL_NODB.sh.sha512 b/web/INSTALL_NODB.sh.sha512
index d13cfba..2f86fd1 100644
--- a/web/INSTALL_NODB.sh.sha512
+++ b/web/INSTALL_NODB.sh.sha512
@@ -1 +1 @@
-c12d31a21acf64cf1423cf050bbb8537969c7c6f3fb115e81394f32414c0e1081c1445902eaffd17cd32259ad8462b92d44f91a8d72b72621c883ee8cda93e0a  INSTALL_NODB.sh
+92bb3778f344bb0673713e34a10cba99487d59c94e469c0a1b7de3a526169daef0d387b7bbff7a1bca49c67232ee1cfa2461e7d8caebb31554f3811e4350f111  INSTALL_NODB.sh