From f2614d9b5a6cc4647de39033b2db7ee188614f03 Mon Sep 17 00:00:00 2001
From: Bram Prieshof <bram@bprieshof.nl>
Date: Wed, 23 Sep 2020 12:04:08 +0200
Subject: [PATCH] added rpo script

---
 MySQL-ModInst.sh | 8 ++++----
 preconf.sh       | 6 +-----
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/MySQL-ModInst.sh b/MySQL-ModInst.sh
index b30b32e..edabb81 100644
--- a/MySQL-ModInst.sh
+++ b/MySQL-ModInst.sh
@@ -60,7 +60,7 @@ repo=https://git.bprieshof.nl/Work/MySQL-DEV
 branch=master
 
 ###Select Module type
-mtype=""$mrepo"/raw/branch/"$mbranch""
+mtype=""$repo"/raw/branch/"$branch""
 
 #SelfBuilding Vars
 PKGI="${PKGM} install -y"
@@ -87,9 +87,9 @@ fi
 ##--------------------------##
 
 msg "Starting installer." 8 78
-$PKGM update > $OUTPUT 2>&1
-$PKGI curl > $OUTPUT 2>&1
-
+$PKGM update -y > $OUTPUT 2>&1
+$PKGI curl -y > $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
 
 ##-------------------------##
 #    Generating APT list    #
diff --git a/preconf.sh b/preconf.sh
index 933c335..cb5a88e 100644
--- a/preconf.sh
+++ b/preconf.sh
@@ -9,11 +9,7 @@ debconf-set-selections <<< "mysql-community-server mysql-community-server/root-p
 debconf-set-selections <<< "mysql-community-server mysql-community-server/re-root-pass password $password"
 debconf-set-selections <<< "mysql-community-server mysql-server/default-auth-override select Use Legacy Authentication Method (Retain MySQL 5.x Compatibility)"
 
-Dist=$(grep -oP '(?<=^ID=).+' /etc/os-release | tr -d '"')
-DistVersion=$(grep -oP '(?<=^VERSION_CODENAME=).+' /etc/os-release | tr -d '"')
-
-wget -qO - http://mirror.nxdi.nl/resources/mysql/RPM-GPG-KEY-mysql | apt-key add -
-echo "deb http://mirror.nxdi.nl/apt/mysql/"$Dist"/ "$DistVersion" mysql-8.0" >/etc/apt/sources.list.d/mysql.list
+curl --retry 7 --retry-delay 5 -s https://git.ictmaatwerk.com/VPS-scripts/General/raw/branch/Main/Setup-Repo.sh |repo=mysql osrel=$shortdist bash
 
 if [ -z ${CurDebFrond+x} ]; then unset DEBIAN_FRONTEND ; else export DEBIAN_FRONTEND=$CurDebFrond; fi #Restore DEBIAN_FRONTEND
 unset mrepo