From cc4ce385ee0be4d0c3b97ce74f5ab9a75094f2ff Mon Sep 17 00:00:00 2001
From: Daniel Bingham <git@dbingham.com>
Date: Mon, 27 Jan 2020 18:33:50 -0800
Subject: [PATCH] Fix install on MacOS to not return error code 2 after a
 normal install

---
 dev/common_install.sh | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/dev/common_install.sh b/dev/common_install.sh
index cd1d0e2..9497264 100644
--- a/dev/common_install.sh
+++ b/dev/common_install.sh
@@ -42,6 +42,7 @@ include #### GetConfFileValue SUBSET ####
 
 function SetLocalOSSettings {
 	USER=root
+	DO_INIT=true
 
 	# LOCAL_OS and LOCAL_OS_FULL are global variables set at GetLocalOS
 
@@ -51,6 +52,7 @@ function SetLocalOSSettings {
 		;;
 		*"MacOSX"*)
 		GROUP=admin
+		DO_INIT=false
 		;;
 		*"msys"*|*"Cygwin"*)
 		USER=""
@@ -425,7 +427,11 @@ umask 0022
 
 GetLocalOS
 SetLocalOSSettings
-GetInit
+# On Mac OS this always produces a warning which causes the installer to fail with exit code 2
+# Since we know it won't work anyway, and that's fine, just skip this step
+if $DO_INIT; then
+	GetInit
+fi
 
 STATS_LINK="http://instcount.netpower.fr?program=$PROGRAM&version=$PROGRAM_VERSION&os=$OS&action=$ACTION"