From 628592f958b1e06eea6f9497e602e16f4b98573a Mon Sep 17 00:00:00 2001
From: 2Shirt <2xShirt@gmail.com>
Date: Sat, 24 Jul 2021 02:40:45 -0600
Subject: [PATCH] Fix Mac memtest tool sections

---
 setup/macos/install-deps      | 5 +----
 setup/macos/update-base-image | 6 +++++-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/setup/macos/install-deps b/setup/macos/install-deps
index f95ae488..60efb25d 100755
--- a/setup/macos/install-deps
+++ b/setup/macos/install-deps
@@ -29,10 +29,7 @@ sudo installer -pkg gnuplot.pkg -target /
 
 # memtest
 echo "Installing memtest..."
-curl -Lo memtest https://github.com/Vavius/memtest/raw/8aa02c8c34db8dd00f4470e482dace7eaff265c7/memtest
-chmod 755 memtest
-sudo chown root:root memtest
-sudo mv -nv memtest /usr/sbin/
+curl -Lo /usr/local/bin/memtest https://github.com/Vavius/memtest/raw/8aa02c8c34db8dd00f4470e482dace7eaff265c7/memtest
 
 # mprime
 echo "Installing mprime..."
diff --git a/setup/macos/update-base-image b/setup/macos/update-base-image
index 7f254221..b62f75d6 100755
--- a/setup/macos/update-base-image
+++ b/setup/macos/update-base-image
@@ -92,10 +92,14 @@ rsync -aS /usr/share/zsh "${WK_PATH}/usr/share"/
 rsync -aS /usr/local/share/zsh "${WK_PATH}/usr/local/share"/
 sed -Ei '' 's!^(root.*)/bin/sh!\1/bin/zsh!' "${WK_PATH}/etc/passwd"
 
+# memtest
+sudo mv -nv "${WK_PATH}/usr/local/bin/memtest" "${WK_PATH}/usr/sbin"/
+sudo chown 0:0 "${WK_PATH}/usr/sbin/memtest"
+sudo chmod 755 "${WK_PATH}/usr/sbin/memtest"
+
 # Misc
 cp -a ../linux/known_networks "${WK_PATH}/.known_networks"
 cp -a /usr/bin/rsync "${WK_PATH}/usr/bin"/
-cp -a /usr/sbin/memtest "${WK_PATH}/usr/sbin"/
 cp -a /usr/sbin/networksetup "${WK_PATH}/usr/sbin"/
 cp -a aliases "${WK_PATH}/.aliases"
 cp -a bashrc "${WK_PATH}/etc/profile"