WMDE
/
osync
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #184 from dbingham/macos-install 

Fix install on MacOS to not return error code 2 after a normal install
This commit is contained in:
Orsiris de Jong 2020-04-29 12:41:11 +02:00 committed by GitHub
parent e997493fb5 cc4ce385ee
commit 7688317bd1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
dev/common_install.sh
View File

@ -44,6 +44,7 @@ include #### GenericTrapQuit SUBSET ####
function SetLocalOSSettings { function SetLocalOSSettings {
USER=root USER=root
DO_INIT=true
# LOCAL_OS and LOCAL_OS_FULL are global variables set at GetLocalOS # LOCAL_OS and LOCAL_OS_FULL are global variables set at GetLocalOS
@ -53,6 +54,7 @@ function SetLocalOSSettings {
;; ;;
*"MacOSX"*) *"MacOSX"*)
GROUP=admin GROUP=admin
DO_INIT=false
;; ;;
*"msys"*|*"Cygwin"*) *"msys"*|*"Cygwin"*)
USER="" USER=""
@ -410,7 +412,11 @@ umask 0022
GetLocalOS GetLocalOS
SetLocalOSSettings 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" STATS_LINK="http://instcount.netpower.fr?program=$PROGRAM&version=$PROGRAM_VERSION&os=$OS&action=$ACTION"