Rebuilt target
This commit is contained in:
parent
60f2005209
commit
5881c71212
11
install.sh
11
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
|
||||
|
@ -2517,6 +2517,7 @@ function FileMove () {
|
|||
|
||||
function SetLocalOSSettings {
|
||||
USER=root
|
||||
DO_INIT=true
|
||||
|
||||
# LOCAL_OS and LOCAL_OS_FULL are global variables set at GetLocalOS
|
||||
|
||||
|
@ -2526,10 +2527,12 @@ function SetLocalOSSettings {
|
|||
;;
|
||||
*"MacOSX"*)
|
||||
GROUP=admin
|
||||
DO_INIT=false
|
||||
;;
|
||||
*"msys"*|*"Cygwin"*)
|
||||
*"Cygwin"*|*"Android"*|*"msys"*|*"BusyBox"*)
|
||||
USER=""
|
||||
GROUP=""
|
||||
DO_INIT=false
|
||||
;;
|
||||
*)
|
||||
GROUP=root
|
||||
|
@ -2883,7 +2886,11 @@ umask 0022
|
|||
|
||||
GetLocalOS
|
||||
SetLocalOSSettings
|
||||
# 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"
|
||||
|
||||
|
|
Loading…
Reference in New Issue