From 1e38e4ae9e96bee621e11982c7b4d340663a2e34 Mon Sep 17 00:00:00 2001
From: Bram Prieshof <bram@bprieshof.nl>
Date: Fri, 25 Sep 2020 14:35:05 +0200
Subject: [PATCH] added Requirements and did some cleanup

---
 MySQL-ModInst.sh | 3 +--
 mysql-8.0.sh     | 7 ++++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/MySQL-ModInst.sh b/MySQL-ModInst.sh
index fd08171..c58373d 100644
--- a/MySQL-ModInst.sh
+++ b/MySQL-ModInst.sh
@@ -96,8 +96,8 @@ fi
 ##--------------------------##
 
 msg "Starting installer." 8 78
+$PKGI curl wget > $OUTPUT 2>&1
 curl --retry 7 --retry-delay 5 -s https://git.ictmaatwerk.com/VPS-scripts/General/raw/branch/Main/Setup-Repo.sh |repo=init osrel=$shortdist bash > $OUTPUT 2>&1
-$PKGI curl > $OUTPUT 2>&1
 
 
 ##-------------------------##
@@ -114,7 +114,6 @@ fi
 ##--------------------## 
 
 msg "Preconfiguring."
-$PKGI software-properties-common gnupg > $OUTPUT 2>&1
 $PKGM update
 $PKGM upgrade -y
 
diff --git a/mysql-8.0.sh b/mysql-8.0.sh
index c4ab972..b9e8629 100644
--- a/mysql-8.0.sh
+++ b/mysql-8.0.sh
@@ -80,8 +80,10 @@ echo "$1"
 ##--------------------------##
 
 msg "Starting installer." 8 78
-$PKGM update -y > $OUTPUT 2>&1
-$PKGI curl > $OUTPUT 2>&1
+$PKGI curl wget > $OUTPUT 2>&1
+curl --retry 7 --retry-delay 5 -s https://git.ictmaatwerk.com/VPS-scripts/General/raw/branch/Main/Setup-Repo.sh |repo=init osrel=$shortdist bash > $OUTPUT 2>&1
+
+
 
 
 ##-------------------------##
@@ -98,7 +100,6 @@ fi
 ##--------------------## 
 
 msg "Preconfiguring."
-$PKGI software-properties-common gnupg > $OUTPUT 2>&1
 $PKGM update -y
 $PKGM upgrade -y