More polish

wfinfo-ng

@@ -13,26 +13,41 @@
 #
 # This'll put it in ~/.cargo/bin, which we exec directly
 #
+set -euo pipefail
 
 # Assumes Flatpak Steam
-wfinfo="$HOME/.cargo/bin/wfinfo-ng"
+wfinfo="$HOME/.cargo/bin/wfinfo"
+update="$HOME/Projects/wfinfo-ng/update.sh"
 logfile="$HOME/.var/app/com.valvesoftware.Steam/.steam/steam/steamapps/compatdata/230410/pfx/drive_c/users/steamuser/AppData/Local/Warframe/EE.log"
 
+tmpdir="$(mktemp -d)"
+pushd "$tmpdir" >/dev/null 2>&1
+echo "Running in $tmpdir"
+
+# Basline tests
 if ! [ -e "$logfile" ]; then
 	echo "Could not find logfile: $logfile"
 	exit 1
 fi
-
 if ! [ -e "$wfinfo" ]; then
 	echo "Could not find wfinfo -- is it installed?"
 	exit 2
-elif ! [ -x "$winfo" ]; then
-	echo "wfinfo exists but isn't executable? What'd you do?"
+fi
+if ! [ -e "$update" ]; then
+	echo "Update script doesn't exist: $update"
 	exit 3
 fi
 
-exec toolbox run \
+"$update"
+
+toolbox run \
 	--container wfinfo-ng \
-	~/.cargo/bin/wfinfo \
+	"$wfinfo" \
 	--window-name "Warframe" \
-	"$logfile"
+	"$logfile" \
+	|| true
+
+popd >/dev/null 2>&1
+echo "Cleaning up $tmpdir"
+rm -rf "$tmpdir"
+echo "All wrapped up"