Merge pull request #501 from nix-community/build-on-detection

fix buildOn=auto detection

Author: Mic92

docs/cli.md

@@ -14,7 +14,8 @@ Options:
 * -p, --ssh-port <ssh_port>
   set the ssh port to connect with
 * --ssh-option <ssh_option>
-  set an ssh option
+  set one ssh option, no need for the '-o' flag, can be repeated.
+  for example: '--ssh-option UserKnownHostsFile=./known_hosts'
 * -L, --print-build-logs
   print full build logs
 * --env-password

docs/reference.md

@@ -35,7 +35,8 @@ Options:
 * -p, --ssh-port <ssh_port>
   set the ssh port to connect with
 * --ssh-option <ssh_option>
-  set an ssh option
+  set one ssh option, no need for the '-o' flag, can be repeated.
+  for example: '--ssh-option UserKnownHostsFile=./known_hosts'
 * -L, --print-build-logs
   print full build logs
 * --env-password

src/nixos-anywhere.sh

@@ -85,7 +85,8 @@ Options:
 * -p, --ssh-port <ssh_port>
   set the ssh port to connect with
 * --ssh-option <ssh_option>
-  set an ssh option
+  set one ssh option, no need for the '-o' flag, can be repeated.
+  for example: '--ssh-option UserKnownHostsFile=./known_hosts'
 * -L, --print-build-logs
   print full build logs
 * --env-password
@@ -545,13 +546,15 @@ checkBuildLocally() {
 
   local entropy
   entropy="$(date +'%Y%m%d%H%M%S')"
+
   if nix build \
     -L \
     "${nixOptions[@]}" \
     --expr \
     "derivation { system = \"$system\"; name = \"env-$entropy\"; builder = \"/bin/sh\"; args = [ \"-c\" \"echo > \$out\" ]; }"; then
     # The local build failed
     buildOn=local
+    return
   fi
 
   buildOn=remote