Merge pull request #150 from daiseeai/master

domenkozar · web-flow · commit a590bb1bf649 · 2022-12-21T15:24:16.000Z
Don't add daemon option if no-daemon is supplied
diff --git a/install-nix.sh b/install-nix.sh
@@ -37,7 +37,7 @@ installer_options=(
 )
 
 # only use the nix-daemon settings if on darwin (which get ignored) or systemd is supported
-if [[ $OSTYPE =~ darwin || -e /run/systemd/system ]]; then
+if [[ (! $INPUT_INSTALL_OPTIONS =~ "--no-daemon") && ($OSTYPE =~ darwin || -e /run/systemd/system) ]]; then
   installer_options+=(
     --daemon
     --daemon-user-count "$(python3 -c 'import multiprocessing as mp; print(mp.cpu_count() * 2)')"

Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ installer_options=(`
`37`	`37`	`)`
`38`	`38`
`39`	`39`	`# only use the nix-daemon settings if on darwin (which get ignored) or systemd is supported`
`40`		`-if [[ $OSTYPE =~ darwin \|\| -e /run/systemd/system ]]; then`
	`40`	`+if [[ (! $INPUT_INSTALL_OPTIONS =~ "--no-daemon") && ($OSTYPE =~ darwin \|\| -e /run/systemd/system) ]]; then`
`41`	`41`	`installer_options+=(`
`42`	`42`	`--daemon`
`43`	`43`	`--daemon-user-count "$(python3 -c 'import multiprocessing as mp; print(mp.cpu_count() * 2)')"`