From 1db5bfe355bbc76796da58383063d29f4e7b7397 Mon Sep 17 00:00:00 2001
From: Bram Prieshof <bprieshof@noreply@ictmaatwerk.com>
Date: Thu, 24 Sep 2020 14:58:22 +0200
Subject: [PATCH] Update 'Setup-Repo.sh'

---
 Setup-Repo.sh | 149 +++++++++++++++++++++++---------------------------
 1 file changed, 68 insertions(+), 81 deletions(-)

diff --git a/Setup-Repo.sh b/Setup-Repo.sh
index ddf8343..a294013 100644
--- a/Setup-Repo.sh
+++ b/Setup-Repo.sh
@@ -2,114 +2,101 @@ dist_ver=$(grep --color=never -Po "^VERSION_ID=\K.*" "/etc/os-release")
 dist=$(grep --color=never -Po "^ID=\K.*" "/etc/os-release")
 dist_name=$(grep -oP '(?<=^VERSION_CODENAME=).+' /etc/os-release | tr -d '"')
 
-
+if [ -z "$osrel" ] ; then
+    if [[ "${dist}" == *"ubuntu"* ]] && [[ "${dist_ver}" == *"18.04"* ]]; then osrel=ubu1804;
+    elif [[ "${dist}" == *"ubuntu"* ]] && [[ "${dist_ver}" == *"20.04"* ]]; then osrel=ubu2004; 
+    elif [[ "${dist}" == *"debian"* ]] && [[ "${dist_ver}" == *"10"* ]]; then osrel=deb10;
+    elif [[ "${dist}" == *"centos"* ]] && [[ "${dist_ver}" == *"8"* ]]; then osrel=cent8;
+    else exit;
+    fi
+fi
 
 init () {
-
-if [ "$osrel" = "ubu1804" ] || [ "$osrel" = "ubu2004" ] ; then
-    apt install -y --no-install-recommends software-properties-common gnupg 
-elif [ "$osrel" = "deb10" ]; then
-    apt install -y --no-install-recommends gnupg2 apt-transport-https lsb-release ca-certificates curl 
-elif [ "$osrel" = "cent8" ]; then
-    dnf install --setopt=install_weak_deps=False --best gnupg
-fi
+    if [ "$osrel" = "ubu1804" ] || [ "$osrel" = "ubu2004" ] ; then
+        apt install -y --no-install-recommends software-properties-common gnupg 
+    elif [ "$osrel" = "deb10" ]; then
+        apt install -y --no-install-recommends gnupg2 apt-transport-https lsb-release ca-certificates curl 
+    elif [ "$osrel" = "cent8" ]; then
+        dnf install --setopt=install_weak_deps=False --best gnupg
+    fi
 }
 
-
 mysql () {
-
-if [ "$osrel" = "ubu1804" ] || [ "$osrel" = "ubu2004" ]  || [ "$osrel" = "deb10" ]; then
-    wget -qO - http://mirror.nxdi.nl/resources/mysql/RPM-GPG-KEY-mysql | apt-key add -
-    echo "deb http://mirror.nxdi.nl/apt/mysql/"$dist"/ "$dist_name" mysql-8.0" >/etc/apt/sources.list.d/mysql.list
-elif [ "$osrel" = "cent8" ]; then
-    rpm --import http://mirror.nxdi.nl/resources/mysql/RPM-GPG-KEY-mysql
-    
-    echo "[mysql80-community]" > /etc/yum.repos.d/mysql.repo
-    echo "name=MySQL 8.0 Community Server" >> /etc/yum.repos.d/mysql.repo
-    echo 'baseurl=http://repo.mysql.com/yum/mysql-8.0-community/el/8/$basearch/' >> /etc/yum.repos.d/mysql.repo
-    echo "enabled=1" >> /etc/yum.repos.d/mysql.repo
-    echo "gpgcheck=1" >> /etc/yum.repos.d/mysql.repo
-    echo "gpgkey=http://mirror.nxdi.nl/resources/mysql/RPM-GPG-KEY-mysql" >> /etc/yum.repos.d/mysql.repo
-    
-    dnf -y module disable mysql
-fi
-
+    if [ "$osrel" = "ubu1804" ] || [ "$osrel" = "ubu2004" ]  || [ "$osrel" = "deb10" ]; then
+        wget -qO - http://mirror.nxdi.nl/resources/mysql/RPM-GPG-KEY-mysql | apt-key add -
+        echo "deb http://mirror.nxdi.nl/apt/mysql/"$dist"/ "$dist_name" mysql-8.0" >/etc/apt/sources.list.d/mysql.list
+    elif [ "$osrel" = "cent8" ]; then
+        rpm --import http://mirror.nxdi.nl/resources/mysql/RPM-GPG-KEY-mysql
+        
+        echo "[mysql80-community]" > /etc/yum.repos.d/mysql.repo
+        echo "name=MySQL 8.0 Community Server" >> /etc/yum.repos.d/mysql.repo
+        echo 'baseurl=http://repo.mysql.com/yum/mysql-8.0-community/el/8/$basearch/' >> /etc/yum.repos.d/mysql.repo
+        echo "enabled=1" >> /etc/yum.repos.d/mysql.repo
+        echo "gpgcheck=1" >> /etc/yum.repos.d/mysql.repo
+        echo "gpgkey=http://mirror.nxdi.nl/resources/mysql/RPM-GPG-KEY-mysql" >> /etc/yum.repos.d/mysql.repo
+        
+        dnf -y module disable mysql
+    fi
 }
 
-
 universe () {
-
-if [ "$osrel" = "ubu1804" ] || [ "$osrel" = "ubu2004" ] ; then
-    add-apt-repository --no-update universe -y -n 
-fi
-
+    if [ "$osrel" = "ubu1804" ] || [ "$osrel" = "ubu2004" ] ; then
+        add-apt-repository --no-update universe -y -n 
+    fi
 }
 
 epel () {
-
-if [ "$osrel" = "cent8" ] ; then
-    $PKGI https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.rpm
-    rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-8
-fi
-
+    if [ "$osrel" = "cent8" ] ; then
+        $PKGI https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.rpm
+        rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-8
+    fi
 }
 
 apache () {
-
-if [ "$osrel" = "ubu1804" ] || [ "$osrel" = "ubu2004" ] ; then
-    add-apt-repository --no-update ppa:ondrej/apache2 -y -n
-elif [ "$osrel" = "deb10" ]; then
-    wget -O /etc/apt/trusted.gpg.d/apache2.gpg https://packages.sury.org/apache2/apt.gpg
-    echo "deb https://packages.sury.org/apache2/ "$dist_name" main" > /etc/apt/sources.list.d/apache2.list
-fi
-
+    if [ "$osrel" = "ubu1804" ] || [ "$osrel" = "ubu2004" ] ; then
+        add-apt-repository --no-update ppa:ondrej/apache2 -y -n
+    elif [ "$osrel" = "deb10" ]; then
+        wget -O /etc/apt/trusted.gpg.d/apache2.gpg https://packages.sury.org/apache2/apt.gpg
+        echo "deb https://packages.sury.org/apache2/ "$dist_name" main" > /etc/apt/sources.list.d/apache2.list
+    fi
 }
 
 nginx () {
+    if [ "$osrel" = "ubu1804" ] || [ "$osrel" = "ubu2004" ] || [ "$osrel" = "deb10" ] ; then
+    echo "deb [arch=amd64] http://nginx.org/packages/"$dist" "$dist_name" nginx" > /etc/apt/sources.list.d/nginx.list
+    curl -fsSL https://nginx.org/keys/nginx_signing.key | sudo apt-key add -
+    elif [ "$osrel" = "cent8" ]; then
+        rpm --import https://nginx.org/keys/nginx_signing.key
 
-if [ "$osrel" = "ubu1804" ] || [ "$osrel" = "ubu2004" ] || [ "$osrel" = "deb10" ] ; then
-   echo "deb [arch=amd64] http://nginx.org/packages/"$dist" "$dist_name" nginx" > /etc/apt/sources.list.d/nginx.list
-   curl -fsSL https://nginx.org/keys/nginx_signing.key | sudo apt-key add -
-elif [ "$osrel" = "cent8" ]; then
-    rpm --import https://nginx.org/keys/nginx_signing.key
-
-    echo '[nginx-stable]' >> /etc/yum.repos.d/nginx.repo
-    echo 'name=nginx stable repo' >> /etc/yum.repos.d/nginx.repo
-    echo 'baseurl=http://nginx.org/packages/centos/$releasever/$basearch/' >> /etc/yum.repos.d/nginx.repo 
-    echo 'gpgcheck=1' >> /etc/yum.repos.d/nginx.repo 
-    echo 'enabled=1' >> /etc/yum.repos.d/nginx.repo 
-    echo 'gpgkey=https://nginx.org/keys/nginx_signing.key' >> /etc/yum.repos.d/nginx.repo 
-    echo 'module_hotfixes=true' >> /etc/yum.repos.d/nginx.repo 
-fi
-
+        echo '[nginx-stable]' >> /etc/yum.repos.d/nginx.repo
+        echo 'name=nginx stable repo' >> /etc/yum.repos.d/nginx.repo
+        echo 'baseurl=http://nginx.org/packages/centos/$releasever/$basearch/' >> /etc/yum.repos.d/nginx.repo 
+        echo 'gpgcheck=1' >> /etc/yum.repos.d/nginx.repo 
+        echo 'enabled=1' >> /etc/yum.repos.d/nginx.repo 
+        echo 'gpgkey=https://nginx.org/keys/nginx_signing.key' >> /etc/yum.repos.d/nginx.repo 
+        echo 'module_hotfixes=true' >> /etc/yum.repos.d/nginx.repo 
+    fi
 }
 
 php () {
-
-if [ "$osrel" = "ubu1804" ] || [ "$osrel" = "ubu2004" ] ; then
-    add-apt-repository --no-update ppa:ondrej/php -y -n
-elif [ "$osrel" = "deb10" ]; then
-    wget -O /etc/apt/trusted.gpg.d/php.gpg https://packages.sury.org/php/apt.gpg
-    echo "deb https://packages.sury.org/php/ "$dist_name" main" > /etc/apt/sources.list.d/php.list
-fi
-
+    if [ "$osrel" = "ubu1804" ] || [ "$osrel" = "ubu2004" ] ; then
+        add-apt-repository --no-update ppa:ondrej/php -y -n
+    elif [ "$osrel" = "deb10" ]; then
+        wget -O /etc/apt/trusted.gpg.d/php.gpg https://packages.sury.org/php/apt.gpg
+        echo "deb https://packages.sury.org/php/ "$dist_name" main" > /etc/apt/sources.list.d/php.list
+    fi
 }
 
 certbot () {
-
-if [ "$osrel" = "ubu1804" ] ; then
-    add-apt-repository --no-update ppa:certbot/certbot -y -n
-fi
-
+    if [ "$osrel" = "ubu1804" ] ; then
+        add-apt-repository --no-update ppa:certbot/certbot -y -n
+    fi
 }
 
-
 redis () {
-
-if [ "$osrel" = "ubu1804" ] || [ "$osrel" = "ubu2004" ] ; then
-    add-apt-repository --no-update ppa:chris-lea/redis-server -y -n
-fi
-
+    if [ "$osrel" = "ubu1804" ] || [ "$osrel" = "ubu2004" ] ; then
+        add-apt-repository --no-update ppa:chris-lea/redis-server -y -n
+    fi
 }
 
 $repo