From 7ee8ebba21ee23fdd8cd27bf98cd135997dc1a99 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=A1=BE=E7=87=95=E5=B3=B0?= <gyf@many-it.com>
Date: Sat, 16 May 2020 09:30:29 +0800
Subject: [PATCH] change the install path, works in Catalina.

---
 ComboJack_Installer/com.XPS.ComboJack.plist |  2 +-
 ComboJack_Installer/install.sh              | 23 ++++++++++++---------
 uninstall.sh                                |  6 +++---
 3 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/ComboJack_Installer/com.XPS.ComboJack.plist b/ComboJack_Installer/com.XPS.ComboJack.plist
index 3973c23..7decf03 100755
--- a/ComboJack_Installer/com.XPS.ComboJack.plist
+++ b/ComboJack_Installer/com.XPS.ComboJack.plist
@@ -8,7 +8,7 @@
 	<string>com.XPS.ComboJack</string>
 	<key>ProgramArguments</key>
 	<array>
-		<string>/usr/local/sbin/ComboJack</string>
+		<string>/usr/local/bin/ComboJack</string>
 	</array>
 	<key>RunAtLoad</key>
 	<true/>
diff --git a/ComboJack_Installer/install.sh b/ComboJack_Installer/install.sh
index dec1a9d..3b4d472 100755
--- a/ComboJack_Installer/install.sh
+++ b/ComboJack_Installer/install.sh
@@ -14,24 +14,27 @@ sudo rm -rf /Library/Extensions/CodecCommander.kext
 sudo rm -f /usr/local/bin/ALCPlugFix
 sudo rm -f /Library/LaunchAgents/good.win.ALCPlugFix
 sudo rm -f /Library/LaunchDaemons/good.win.ALCPlugFix
-sudo rm -f /usr/local/sbin/hda-verb
+sudo rm -f /usr/local/bin/hda-verb
 sudo rm -f /usr/local/share/ComboJack/Headphone.icns
 sudo rm -f /usr/local/share/ComboJack/l10n.json
 
-# install 
-mkdir -p /usr/local/sbin
-sudo cp ComboJack /usr/local/sbin
-sudo chmod 755 /usr/local/sbin/ComboJack
-sudo chown root:wheel /usr/local/sbin/ComboJack
-sudo spctl --add /usr/local/sbin/ComboJack
-sudo cp hda-verb /usr/local/sbin
-#sudo chmod 755 /usr/local/sbin/hda-verb
-#sudo chown root:wheel /usr/local/sbin/hda-verb
+# install ComboJack
+sudo cp ComboJack /usr/local/bin
+sudo chmod 755 /usr/local/bin/ComboJack
+sudo chown root:wheel /usr/local/bin/ComboJack
+sudo spctl --add /usr/local/bin/ComboJack
+# install hda-verb
+sudo cp hda-verb /usr/local/bin
+sudo chmod 755 /usr/local/bin/hda-verb
+sudo chown root:wheel /usr/local/bin/hda-verb
+# install Headphone.icns
 sudo mkdir -p /usr/local/share/ComboJack/
 sudo cp Headphone.icns /usr/local/share/ComboJack/
 sudo chmod 644 /usr/local/share/ComboJack/Headphone.icns
+# install l10n.json
 sudo cp l10n.json /usr/local/share/ComboJack/
 sudo chmod 644 /usr/local/share/ComboJack/l10n.json
+# install com.XPS.ComboJack.plist
 sudo cp com.XPS.ComboJack.plist /Library/LaunchDaemons/
 sudo chmod 644 /Library/LaunchDaemons/com.XPS.ComboJack.plist
 sudo chown root:wheel /Library/LaunchDaemons/com.XPS.ComboJack.plist
diff --git a/uninstall.sh b/uninstall.sh
index 2d932cd..d65b2b3 100755
--- a/uninstall.sh
+++ b/uninstall.sh
@@ -13,9 +13,9 @@ sudo rm /Library/LaunchDaemons/com.XPS.ComboJack.plist
 sudo rm /usr/local/share/ComboJack/l10n.json
 sudo rm /usr/local/share/ComboJack/Headphone.icns
 sudo rm -r /usr/local/share/ComboJack
-sudo rm /usr/local/sbin/hda-verb
-sudo spctl --remove /usr/local/sbin/ComboJack
-sudo rm /usr/local/sbin/ComboJack
+sudo rm /usr/local/bin/hda-verb
+sudo spctl --remove /usr/local/bin/ComboJack
+sudo rm /usr/local/bin/ComboJack
 echo
 echo "Please reboot! Remember to remove VerbStub.kext as well."
 echo