Merge #30

bors[bot] · Mic92 · web-flow · commit 61a3eaa8dbf6 · 2023-01-12T08:28:59.000Z
30: fix command check when gathering facts r=Mic92 a=Mic92



Co-authored-by: Jörg Thalheim &lt;joerg@thalheim.io&gt;
diff --git a/src/nixos-remote.sh b/src/nixos-remote.sh
@@ -163,7 +163,7 @@ until facts=$(
   ssh_ -o ConnectTimeout=10 -- <<SSH
 set -efu ${enable_debug}
 has(){
-  command -v tar >/dev/null && echo "y" || echo "n"
+  command -v "\$1" >/dev/null && echo "y" || echo "n"
 }
 cat <<FACTS
 is_os=\$(uname)

Original file line number	Diff line number	Diff line change
`@@ -163,7 +163,7 @@ until facts=$(`
`163`	`163`	`ssh_ -o ConnectTimeout=10 -- <<SSH`
`164`	`164`	`set -efu ${enable_debug}`
`165`	`165`	`has(){`
`166`		`- command -v tar >/dev/null && echo "y" \|\| echo "n"`
	`166`	`+ command -v "\$1" >/dev/null && echo "y" \|\| echo "n"`
`167`	`167`	`}`
`168`	`168`	`cat <<FACTS`
`169`	`169`	`is_os=\$(uname)`