From 50e4164bf84e58d5928b85525bef4f2ab08308d4 Mon Sep 17 00:00:00 2001
From: 2Shirt <2xShirt@gmail.com>
Date: Mon, 5 Apr 2021 16:44:45 -0600
Subject: [PATCH] Apply bugfixes for macOS sections

---
 setup/macos/install-deps       |  6 +++++-
 setup/macos/live-macos-startup |  4 ++--
 setup/macos/update-base-image  | 11 +++++------
 3 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/setup/macos/install-deps b/setup/macos/install-deps
index 7112394f..492d693c 100755
--- a/setup/macos/install-deps
+++ b/setup/macos/install-deps
@@ -29,7 +29,11 @@ sudo installer -pkg gnuplot.pkg -target /
 
 # mprime
 echo "Installing mprime..."
-curl -Lo prime95.tar.gz http://www.mersenne.org/ftp_root/gimps/p95v298b7.MacOSX.noGUI.tar.gz
+if [[ "${OS_VERSION:3:2}" -ge "15" ]]; then
+  curl -Lo prime95.tar.gz http://www.mersenne.org/ftp_root/gimps/p95v298b7.MacOSX.noGUI.tar.gz
+else
+  curl -Lo prime95.tar.gz http://www.mersenne.org/ftp_root/gimps/p95v287.MacOSX.noGUI.tar.gz
+fi
 sudo tar -x -C /usr/local/bin -f prime95.tar.gz mprime
 
 # smc
diff --git a/setup/macos/live-macos-startup b/setup/macos/live-macos-startup
index 2196b681..7b5d3e7b 100755
--- a/setup/macos/live-macos-startup
+++ b/setup/macos/live-macos-startup
@@ -7,7 +7,7 @@ for p in /usr/local/{,opt/{e2fsprogs,ruby,util-linux}/}{bin,sbin}; do
   PATH="${p}:${PATH}"
 done
 
-# Create and mount RAMDisk
+# Create and mount RAM_Disk
 if ! [[ -d /Volumes/RAM_Disk ]]; then
   echo "Creating RAM Disk..."
   RAM_DEV="$(hdiutil attach -nomount ram://524288)"
@@ -30,7 +30,7 @@ if ! [[ -e /Volumes/RAM_Disk/.wifi ]]; then
       | grep -Eo 'en(\d+)')"
     networksetup -setairportnetwork "${NET_DEV}" "${WIFI_NET%%:::*}" "${WIFI_NET##*:::}"
     touch /Volumes/RAM_Disk/.wifi
-    sleep 5s
+    sleep 8s
   fi
 fi
 
diff --git a/setup/macos/update-base-image b/setup/macos/update-base-image
index c010cd43..2ad34a53 100755
--- a/setup/macos/update-base-image
+++ b/setup/macos/update-base-image
@@ -14,6 +14,7 @@ IMAGE_DEV="$(hdiutil attach -mountpoint /Volumes/BaseSystem "${BASE_IMAGE}" -nob
 OS_NAME="$(ls /Volumes/BaseSystem | grep -E 'OS X|macOS' | sed -E 's/Install (OS X|macOS) (.*)\.app/\2/')"
 OS_VERSION="$(defaults read /Volumes/BaseSystem/System/Library/CoreServices/SystemVersion ProductVersion)"
 OUT_NAME="${HOME}/Desktop/WK ${OS_NAME} ($(date +"%Y-%m-%d"))"
+TIMEZONE="$(fgrep LINUX_TIME_ZONE ../../scripts/wk/cfg/main.py | cut -d '=' -f 2 | sed "s/'//g")"
 WK_PATH="/Volumes/1201_UFD"
 
 # Convert to a 4 GB R/W image
@@ -73,15 +74,13 @@ rsync -aS com.apple.Terminal.plist "${WK_PATH}/var/root/Library/Preferences"/
 
 # Timezones
 echo "Installing timezones..."
-eval "$(fgrep LINUX_TIME ../../scripts/wk/cfg/main.py)"
 if [[ "${OS_VERSION:3:2}" == "11" ]]; then
   rsync -aS /usr/share/zoneinfo/ "${WK_PATH}/usr/share/zoneinfo"/
-  ln -sf "/usr/share/zoneinfo/${LINUX_TIME}" "${WK_PATH}/etc/localtime"
+  ln -sf "/usr/share/zoneinfo/${TIMEZONE}" "${WK_PATH}/etc/localtime"
 elif [[ "${OS_VERSION:3:2}" -gt "11" ]]; then
-  if [[ ! -d "${WK_PATH}/var/db/timezone" ]]; then
-    rsync -aS /var/db/timezone "${WK_PATH}/var/db"/
-  fi
-  ln -sf "/var/db/timezone/zoneinfo/${LINUX_TIME}" "${WK_PATH}/etc/localtime"
+  sudo mkdir -p "${WK_PATH}/var/db/timezone/zoneinfo"
+  sudo rsync -aS /var/db/timezone/zoneinfo/ "${WK_PATH}/var/db/timezone/zoneinfo"/
+  ln -sf "/var/db/timezone/zoneinfo/${TIMEZONE}" "${WK_PATH}/etc/localtime"
 fi
 
 # zsh