From 0ea635046022a035a7d1664535a4a9dd2d78d891 Mon Sep 17 00:00:00 2001
From: Marwolf <cleako@gmail.com>
Date: Mon, 16 Jul 2018 18:59:50 -0400
Subject: [PATCH] Fedora 28 x64 now supported

---
 README.md          | 11 +++++++++++
 Setup_Linux_Mac.sh | 39 ++++++++++++++++++++++++++++++++-------
 2 files changed, 43 insertions(+), 7 deletions(-)

diff --git a/README.md b/README.md
index f0029e8..02a37fb 100644
--- a/README.md
+++ b/README.md
@@ -7,6 +7,17 @@ Choices:
   2. Game + Website + PHPMyAdmin
   3. Game + Website + PHPMyAdmin + RSC Preservation Wiki
 
+
+Operating systems supported:
+
+* Windows 10 x64
+
+* Mac OS X High Sierra
+
+* Ubuntu Linux 18.04 x64
+
+* Fedora Linux 28 x64
+
 ___
 
 ## Choice 1: Download the zip, extract it, and open the "Docker-Home" folder
diff --git a/Setup_Linux_Mac.sh b/Setup_Linux_Mac.sh
index 58e78c8..c3b7f52 100755
--- a/Setup_Linux_Mac.sh
+++ b/Setup_Linux_Mac.sh
@@ -108,15 +108,20 @@ if [ "$install" == "1" ]; then
 
     # Fedora OS ===================================================>
     elif [ "$os" == "2" ]; then
-        su -c 'yum update && yum install git'
         echo ""
         echo ""
         echo "Verifying the basics are installed."
         echo ""
-        su -c 'yum update && yum install unzip git build-essential apt-transport-https ca-certificates curl software-properties-common'
+        sudo dnf -y update && sudo dnf -y upgrade && sudo dnf -y install screen make unzip git ca-certificates curl yum-utils device-mapper-persistent-data lvm2
         echo ""
         echo ""
-        echo "Do you have Java OpenJDK installed already?"
+        echo "Permitting default game port 53595/tcp through the firewall."
+        firewall-cmd --permanent --add-port=53595/tcp
+        echo ""
+        firewall-cmd --reload
+        echo ""
+        echo ""
+        echo "Do you have Java OpenJDK and Apache Ant installed already?"
         echo ""
         echo "${RED}1${NC} - Install for me!"
         echo "${RED}2${NC} - Im all set"
@@ -125,8 +130,7 @@ if [ "$install" == "1" ]; then
 
         # Fedora Java ===================================================>
         if [ "$java" == "1" ]; then
-            su -c 'yum install alternatives'
-            su -c '/usr/sbin/alternatives --config java'
+            sudo dnf -y install ant
         else
           continue
         fi
@@ -143,10 +147,31 @@ if [ "$install" == "1" ]; then
 
         # Fedora Docker ===================================================>
         if [ "$docker" == "1" ]; then
+            echo "Removing any old versions of Docker that might confict."
+            echo ""
+            sudo dnf -y remove docker \
+                 docker-client \
+                 docker-client-latest \
+                 docker-common \
+                 docker-latest \
+                 docker-latest-logrotate \
+                 docker-logrotate \
+                 docker-selinux \
+                 docker-engine-selinux \
+                 docker-engine
+            echo ""
+            echo ""
             echo "Attempting to install Docker now"
             echo ""
-            curl -fsSL get.docker.com -o get-docker.sh
-            su -c 'sh get-docker.sh'
+            sudo dnf -y install dnf-plugins-core
+            sudo dnf -y config-manager \
+              --add-repo \
+              https://download.docker.com/linux/fedora/docker-ce.repo
+            sudo dnf -y install docker-ce docker-compose
+            sudo systemctl start docker
+            sudo groupadd docker
+            sudo usermod -aG docker $USER
+            sudo systemctl enable docker
         else
           continue
         fi