From 7e6637847dbbde0b55e69b59b722cbd7e189a93f Mon Sep 17 00:00:00 2001
From: Marco Ochse <marco.ochse@gmail.com>
Date: Sun, 24 Jun 2018 02:38:41 +0200
Subject: [PATCH] tweaking
---
bin/clean.sh | 3 ++-
iso/installer/install.sh | 4 ++--
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/bin/clean.sh b/bin/clean.sh
index ce84c0a8..5f4b2c49 100755
--- a/bin/clean.sh
+++ b/bin/clean.sh
@@ -114,7 +114,7 @@ fuELK () {
# ELK data will be kept for <= 90 days, check /etc/crontab for curator modification
# ELK daemon log files will be removed
if [ "$myPERSISTENCE" != "on" ]; then rm -rf /data/elk/log/*; fi
- mkdir -p /data/elk
+ mkdir -p /data/elk
chmod 760 /data/elk -R
chown tpot:tpot /data/elk -R
}
@@ -170,6 +170,7 @@ fuMAILONEY () {
# Let's create a function to clean up nginx logs
fuNGINX () {
if [ "$myPERSISTENCE" != "on" ]; then rm -rf /data/nginx/log/*; fi
+ touch /data/nginx/log/error.log
chmod 644 /data/nginx/conf -R
chmod 644 /data/nginx/cert -R
}
diff --git a/iso/installer/install.sh b/iso/installer/install.sh
index 4ae88bab..ffe48674 100755
--- a/iso/installer/install.sh
+++ b/iso/installer/install.sh
@@ -631,9 +631,9 @@ case $myCONF_TPOT_FLAVOR in
esac
# Let's load docker images
-myIMAGESCOUNT=$(cat $myTPOTCOMPOSE | grep -v '#' | grep image | cut -d: -f2 | wc -l)
+myIMAGESCOUNT=$(cat $myTPOTCOMPOSE | grep -v '#' | grep image | cut -d: -f2 | uniq | wc -l)
j=0
-for name in $(cat $myTPOTCOMPOSE | grep -v '#' | grep image | cut -d'"' -f2)
+for name in $(cat $myTPOTCOMPOSE | grep -v '#' | grep image | cut -d'"' -f2 | uniq)
do
dialog --title "[ Downloading docker images, please be patient ]" --backtitle "$myBACKTITLE" \
--gauge "\n Now downloading: $name\n" 8 80 $(expr 100 \* $j / $myIMAGESCOUNT) <<EOF