diff --git a/dev/common_install.sh b/dev/common_install.sh index 6bec72c..d91f367 100755 --- a/dev/common_install.sh +++ b/dev/common_install.sh @@ -10,7 +10,7 @@ PROGRAM_BINARY=$PROGRAM".sh" PROGRAM_BATCH=$PROGRAM"-batch.sh" SSH_FILTER="ssh_filter.sh" -SCRIPT_BUILD=2020031502 +SCRIPT_BUILD=2020042901 INSTANCE_ID="installer-$SCRIPT_BUILD" ## osync / obackup / pmocr / zsnap install script @@ -44,6 +44,7 @@ include #### GenericTrapQuit SUBSET #### function SetLocalOSSettings { USER=root + DO_INIT=true # LOCAL_OS and LOCAL_OS_FULL are global variables set at GetLocalOS @@ -53,10 +54,12 @@ function SetLocalOSSettings { ;; *"MacOSX"*) GROUP=admin + DO_INIT=false ;; - *"msys"*|*"Cygwin"*) + *"Cygwin"*|*"Android"*|*"msys"*|*"BusyBox"*) USER="" GROUP="" + DO_INIT=false ;; *) GROUP=root @@ -410,7 +413,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"