From 2e42fcee157aee669070d8f70219c8d5b251fe41 Mon Sep 17 00:00:00 2001
From: Josh Jordan <joshjordan@users.noreply.github.com>
Date: Wed, 7 Oct 2020 16:16:31 -0400
Subject: [PATCH] Introductory notes for OS X (#760)

---
 build.sh        | 35 ++++++++++++++++++++---------------
 docs/index.html |  2 +-
 2 files changed, 21 insertions(+), 16 deletions(-)

diff --git a/build.sh b/build.sh
index e767367b..8070c8b5 100755
--- a/build.sh
+++ b/build.sh
@@ -33,7 +33,7 @@ go_install(){
 	  	sudo tar -C /usr/local -xzf go*.linux-amd64.tar.gz > /dev/null 2>&1
       echo "Clean unneeded files"
 	  	rm go*.linux-amd64.tar.gz
-      
+
     elif [ "$distribution" = "Fedora" ]; then
       echo "Downloading Go"
       wget https://dl.google.com/go/go"$go_version".linux-amd64.tar.gz > /dev/null 2>&1
@@ -41,7 +41,7 @@ go_install(){
 	    sudo tar -C /usr/local -xzf go*.linux-amd64.tar.gz > /dev/null 2>&1
       echo "Clean unneeded files"
 	    rm go*.linux-amd64.tar.gz
-    
+
     elif [ "$distribution" = "Debian" ] || [ "$distribution" = "Ubuntu" ] || [ "$distribution" = "Deepin" ]; then
       echo "Downloading Go"
       wget https://dl.google.com/go/go"$go_version".linux-amd64.tar.gz > /dev/null 2>&1
@@ -49,13 +49,13 @@ go_install(){
 	    sudo tar -C /usr/local -xzf go*.linux-amd64.tar.gz > /dev/null 2>&1
       echo "Clean unneeded files"
 	    rm go*.linux-amd64.tar.gz
-      
+
     elif [ "$distribution" = "Gentoo" ]; then
       sudo emerge --ask n go
-      
+
     elif [ "$distribution" = "Manjaro" ] || [ "$distribution" = "Arch\ Linux" ]; then
       sudo pacman -S go --noconfirm
-	  
+
 	elif [ "$distribution" = "OpenSUSE" ] || [ "$distribution" = "SUSE" ]; then
 	  echo "Downloading Go"
       wget https://dl.google.com/go/go"$go_version".linux-amd64.tar.gz > /dev/null 2>&1
@@ -71,27 +71,31 @@ fi
 dep_install(){
 	  if [ "$distribution" = "CentOS" ] || [ "$distribution" = "Red\ Hat" ] || [ "$distribution" = "Oracle" ]; then
 	  sudo yum install -y libX11-devel libXcursor-devel libXrandr-devel libXinerama-devel mesa-libGL-devel alsa-lib-devel libXi-devel > /dev/null 2>&1
-		
+
     elif [ "$distribution" = "Fedora" ]; then
 	  sudo dnf install -y libX11-devel libXcursor-devel libXrandr-devel libXinerama-devel mesa-libGL-devel alsa-lib-devel libXi-devel > /dev/null 2>&1
-		
+
     elif [ "$distribution" = "Debian" ] || [ "$distribution" = "Ubuntu" ] || [ "$distribution" = "Deepin" ]; then
 	  sudo apt-get install -y libxcursor-dev libxrandr-dev libxinerama-dev libxi-dev libgl1-mesa-dev libsdl2-dev libasound2-dev > /dev/null 2>&1
-		
+
     elif [ "$distribution" = "Gentoo" ]; then
     sudo emerge --ask n libXcursor libXrandr libXinerama libXi libGLw libglvnd libsdl2 alsa-lib > /dev/null 2>&1
-		
+
     elif [ "$distribution" = "Manjaro" ] || [ "$distribution" = "Arch\ Linux" ]; then
 
-    if [ -z "$mesa_detect_arch" ]; then
-		sudo pacman -S libxcursor libxrandr libxinerama libxi mesa libglvnd sdl2 sdl2_mixer sdl2_net alsa-lib --noconfirm > /dev/null 2>&1
-    else
-    sudo pacman -S libxcursor libxrandr libxinerama libxi libglvnd sdl2 sdl2_mixer sdl2_net alsa-lib --noconfirm > /dev/null 2>&1
-    fi
+      if [ -z "$mesa_detect_arch" ]; then
+  		sudo pacman -S libxcursor libxrandr libxinerama libxi mesa libglvnd sdl2 sdl2_mixer sdl2_net alsa-lib --noconfirm > /dev/null 2>&1
+      else
+      sudo pacman -S libxcursor libxrandr libxinerama libxi libglvnd sdl2 sdl2_mixer sdl2_net alsa-lib --noconfirm > /dev/null 2>&1
+      fi
 
 	  elif [ "$distribution" = "OpenSUSE" ] || [ "$distribution" = "SUSE" ]; then
 		sudo zypper install -y libX11-devel libXcursor-devel libXrandr-devel libXinerama-devel Mesa-libGL-devel alsa-lib-devel libXi-devel > /dev/null 2>&1
 
+    elif [[ "$OSTYPE" == "darwin"* ]]; then
+    # are there dependencies required? did I just have all of them already?
+    echo "Mac OS detected, no dependency installation necessary..."
+
     fi
 }
 
@@ -108,4 +112,5 @@ fi
 echo "Build OpenDiablo 2"
 go get -d
 go build
-echo "Build finished. Please edit config.json before running OpenDiablo2"
+echo "Build finished. Running OpenDiablo2 will generate a config.json file."
+echo "If there are subsequent errors, please inspect and edit the config.json file. See doc/index.html for more details"
diff --git a/docs/index.html b/docs/index.html
index b536def8..ff1c50d0 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -53,7 +53,7 @@
 	<hr />
 	<h2 id="config">Configuration</h2>
 	<div class="paragraph">
-	<span>There is a configuration file (config.json) that should be located in the root folder. The following table describes the different options and what they mean.</span>
+	<span>There is a configuration file (config.json) whose location depends on your operating system. It will be generated when OpenDiablo2 is run and the output will show the file location for editing. The following table describes the different options and what they mean.</span>
 		<table>
 			<thead>
 			<tr>