add get-facts checks for tools

Author: fidgetingbits

src/get-facts.sh

@@ -19,5 +19,7 @@ hasDoas=$(has doas)
 hasWget=$(has wget)
 hasCurl=$(has curl)
 hasSetsid=$(if [ "$(has setsid)" = "y" ] && setsid --wait true 2>/dev/null; then echo "y"; else echo "n"; fi)
+hasGrep=$(has grep)
+hasSystemdInhibit=$(has systemd-inhibit)
 hasNixOSFacter=$(command -v nixos-facter >/dev/null && echo "y" || echo "n")
 FACTS

src/nixos-anywhere.sh

@@ -57,6 +57,8 @@ hasDoas=
 hasWget=
 hasCurl=
 hasSetsid=
+hasGrep=
+hasSystemdInhibit=
 hasNixOSFacter=
 
 tempDir=$(mktemp -d)
@@ -585,7 +587,7 @@ importFacts() {
 
   # Necessary to prevent Bash erroring before printing out which fact had an issue
   set +u
-  for var in isOs isArch isInstaller isContainer isRoot hasIpv6Only hasTar hasCpio hasSudo hasDoas hasWget hasCurl hasSetsid; do
+  for var in isOs isArch isInstaller isContainer isRoot hasIpv6Only hasTar hasCpio hasSudo hasDoas hasWget hasCurl hasSetsid hasGrep hasSystemdInhibit; do
     if [[ -z ${!var} ]]; then
       abort "Failed to retrieve fact $var from host"
     fi
@@ -915,28 +917,30 @@ SSH
 nixosReboot() {
   step Rebooting
 
-  # disable debug output temporarily to prevent log spam
-  set +x
-
-  local inhibited
-  inhibited=$(
-    runSsh sh <<SSH
-  if command -v systemd-inhibit >/dev/null && systemd-inhibit --list | grep -q 'shutdown'; then
-    systemd-inhibit --list
-  fi
+  if [[ $hasSystemdInhibit == "y" ]] && [[ $hasGrep == "y" ]]; then
+    # disable debug output temporarily to prevent log spam
+    set +x
+  
+    local inhibited
+    inhibited=$(
+      runSsh sh <<SSH
+    if systemd-inhibit --list | grep -q 'shutdown'; then
+      systemd-inhibit --list
+    fi
 SSH
-  )
-  if [ -n "${inhibited}" ]; then
-    echo "WARNING: Reboot is currently inhibited. Manual reboot may be required. Run 'systemd-inhibit --list' on the target for further details" 2>&1
+    )
+    if [ -n "${inhibited}" ]; then
+      echo "WARNING: Reboot is currently inhibited. Manual reboot may be required. Run 'systemd-inhibit --list' on the target for further details" 2>&1
+      if [[ -n ${enableDebug} ]]; then
+        echo "${inhibited}" 2>&1
+      fi
+    fi
+  
     if [[ -n ${enableDebug} ]]; then
-      echo "${inhibited}" 2>&1
+      set -x
     fi
   fi
 
-  if [[ -n ${enableDebug} ]]; then
-    set -x
-  fi
-
   runSsh sh <<SSH
   if command -v zpool >/dev/null && [ "\$(zpool list)" != "no pools available" ]; then
     # we always want to export the zfs pools so people can boot from it without force import