also put logs into kexec directory (#592)

Author: Mic92

src/get-facts.sh

@@ -20,5 +20,4 @@ hasWget=$(has wget)
 hasCurl=$(has curl)
 hasSetsid=$(has setsid)
 hasNixOSFacter=$(command -v nixos-facter >/dev/null && echo "y" || echo "n")
-remoteHomeDir=$HOME
 FACTS

src/nixos-anywhere.sh

@@ -58,7 +58,6 @@ hasWget=
 hasCurl=
 hasSetsid=
 hasNixOSFacter=
-remoteHomeDir=
 
 tempDir=$(mktemp -d)
 trap 'rm -rf "$tempDir"' EXIT
@@ -586,16 +585,13 @@ 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 remoteHomeDir; do
+  for var in isOs isArch isInstaller isContainer isRoot hasIpv6Only hasTar hasCpio hasSudo hasDoas hasWget hasCurl hasSetsid; do
     if [[ -z ${!var} ]]; then
       abort "Failed to retrieve fact $var from host"
     fi
   done
   set -u
 
-  # Compute the log file path from the home directory
-  remoteLogFile="${remoteHomeDir}/.nixos-anywhere.log"
-
   if [[ -n ${enableDebug} ]]; then
     set -x
   fi
@@ -722,10 +718,6 @@ runKexec() {
     kexecUrl=${kexecUrl/"github.com"/"gh-v6.com"}
   fi
 
-  if [[ -z $remoteLogFile ]]; then
-    abort "Could not create a temporary log file for $sshUser"
-  fi
-
   # Handle kexec operation failures
   handleKexecFailure() {
     local operation=$1
@@ -734,7 +726,8 @@ runKexec() {
     local logContent=""
     if logContent=$(
       set +x
-      runSsh "cat \"$remoteLogFile\" 2>/dev/null" 2>/dev/null
+      # shellcheck disable=SC2016 # We want $HOME to expand on the remote server
+      runSsh 'cat "$HOME/kexec/nixos-anywhere.log" 2>/dev/null' 2>/dev/null
     ); then
       echo "Remote output log:" >&2
       echo "$logContent" >&2
@@ -743,28 +736,21 @@ runKexec() {
     exit 1
   }
 
-  # Extract directly to the user's home directory
-  if [[ -z $remoteHomeDir ]]; then
-    abort "Could not determine home directory for user $sshUser"
-  fi
-
   # Define common remote commands template
   local remoteCommandTemplate
   remoteCommandTemplate="
 # Run kexec commands with sudo if needed
 {
   set -eu ${enableDebug}
-  ${maybeSudo} rm -rf \"$remoteHomeDir/kexec\"
-  mkdir -p \"$remoteHomeDir/kexec\"
-  cd \"$remoteHomeDir/kexec\"
+  cd \"\$HOME/kexec\"
   echo Downloading kexec tarball, this may take a moment...
   # Execute tar command
   %TAR_COMMAND%
-  TMPDIR=\"$remoteHomeDir/kexec\" ${maybeSudo} setsid --wait \"$remoteHomeDir/kexec/kexec/run\" --kexec-extra-flags $(printf '%q' "$kexecExtraFlags")
-} 2>&1 | tee \"$remoteLogFile\" || true
+  TMPDIR=\"\$HOME/kexec\" ${maybeSudo} setsid --wait \"\$HOME/kexec/kexec/run\" --kexec-extra-flags $(printf '%q' "$kexecExtraFlags")
+} 2>&1 | tee \"\$HOME/kexec/nixos-anywhere.log\" || true
 
 # The script will likely disconnect us, so we consider it successful if we see the kexec message
-if ! grep -q 'machine will boot into nixos' \"$remoteLogFile\"; then
+if ! grep -q 'machine will boot into nixos' \"\$HOME/kexec/nixos-anywhere.log\"; then
   echo 'Kexec may have failed - check output above'
   exit 1
 fi
@@ -803,20 +789,25 @@ fi
     # Use remote command for download
     tarCommand="$(printf '%q ' "${remoteUploadCommand[@]}") | tar -xv ${tarDecomp}"
   else
-    # Upload the kexec tarball first
-    "${localUploadCommand[@]}" | runSsh "cat > \"$remoteHomeDir\"/kexec-tarball.tar.gz"
     # Use local file for extraction
-    tarCommand="cat \"$remoteHomeDir\"/kexec-tarball.tar.gz | tar -xv ${tarDecomp}"
+    tarCommand="cat \"\$HOME/kexec/kexec-tarball.tar.gz\" | tar -xv ${tarDecomp}"
   fi
 
   local remoteCommands
   remoteCommands=${remoteCommandTemplate//'%TAR_COMMAND%'/$tarCommand}
 
   # Create and execute the script on the remote system
-  runSsh "mkdir -p \"$remoteHomeDir/kexec\" && cat > \"$remoteHomeDir/kexec/unpack.sh\"" <<EOF
+  # shellcheck disable=SC2016 # We want $HOME to expand on the remote server
+  runSsh 'mkdir -p "$HOME/kexec" && cat > "$HOME/kexec/nixos-anywhere-kexec.sh"' <<EOF
 $remoteCommands
 EOF
-  runSsh "bash $remoteHomeDir/kexec/unpack.sh" || handleKexecFailure "Kexec"
+  if [[ ${#localUploadCommand[@]} -gt 0 ]]; then
+    # Upload the kexec tarball first
+    # shellcheck disable=SC2016 # We want $HOME to expand on the remote server
+    "${localUploadCommand[@]}" | runSsh 'cat > "$HOME/kexec/kexec-tarball.tar.gz"'
+  fi
+  # shellcheck disable=SC2016 # We want $HOME to expand on the remote server
+  runSsh 'bash "$HOME/kexec/nixos-anywhere-kexec.sh"' || handleKexecFailure "Kexec"
 
   # use the default SSH port to connect at this point
   local i