Normalize the package extraction path

deploy.fish

@@ -53,7 +53,8 @@ begin
 
         set -a files \
             "$downloadPath" \
-            "$dir"
+            "$dir" \
+            "$name"
 
         mkdir -p (dirname "$downloadPath")
 
@@ -62,10 +63,10 @@ begin
         end
     end
 
-    set -l intel $files[1..2]
-    set -l marvell $files[3..4]
-    set -l git $files[5..6]
-    set -l pwsh $files[7..8]
+    set -l intel $files[1..3]
+    set -l marvell $files[4..6]
+    set -l git $files[7..9]
+    set -l pwsh $files[10..12]
 
     cp -r "$dir/winfs"/* "$winpeOverlay"
     mkdir -p "$winpeOverlay/drivers"
@@ -73,14 +74,16 @@ begin
     begin
         set -l tempDir (mktemp -d)
         unzip "$intel[1]" -d "$tempDir"
-        cp -r "$tempDir/$intel[2]" "$winpeOverlay/drivers/IntelNetwork"
+        mkdir -p (dirname "$winpeOverlay/$intel[3]")
+        cp -r "$tempDir/$intel[2]" "$winpeOverlay/$intel[3]"
         rm -rf "$tempDir"
     end
 
     begin
         set -l tempDir (mktemp -d)
         unzip "$marvell[1]" -d "$tempDir"
-        cp -r "$tempDir/$marvell[2]" "$winpeOverlay/drivers/MarvellNetwork"
+        mkdir -p (dirname "$winpeOverlay/$marvell[3]")
+        cp -r "$tempDir/$marvell[2]" "$winpeOverlay/$marvell[3]"
         rm -rf "$tempDir"
     end
 
@@ -89,14 +92,16 @@ begin
         pushd "$tempDir" > /dev/null
         7z x "$git[1]"
         popd > /dev/null
-        cp -r "$tempDir/$git[2]" "$winpeOverlay/git"
+        mkdir -p (dirname "$winpeOverlay/$git[3]")
+        cp -r "$tempDir/$git[2]" "$winpeOverlay/$git[3]"
         rm -rf "$tempDir"
     end
 
     begin
         set -l tempDir (mktemp -d)
         unzip "$pwsh[1]" -d "$tempDir"
-        cp -r "$tempDir/$pwsh[2]" "$winpeOverlay/PowerShell"
+        mkdir -p (dirname "$winpeOverlay/$pwsh[3]")
+        cp -r "$tempDir/$pwsh[2]" "$winpeOverlay/$pwsh[3]"
         rm -rf "$tempDir"
     end
 

winfs/Scripts/Startup.cmd

@@ -1,4 +1,4 @@
 @echo off
 wpeutil SetKeyboardLayout 0807:00000807
 echo Launching Startup Script...
-start X:\PowerShell\pwsh.exe -NoExit -ExecutionPolicy bypass -file "X:\Scripts\Startup.ps1"
+start X:\software\pwsh\pwsh.exe -NoExit -ExecutionPolicy bypass -file "X:\Scripts\Startup.ps1"

winfs/Scripts/Startup.ps1

@@ -1,6 +1,6 @@
 $null = $env:WIN_COMPUTER_NAME;
 $null = $env:SETUP_SCRIPT_NAME;
 
-Set-Alias git "X:/git/bin/git.exe";
+Set-Alias git "X:/software/git/bin/git.exe";
 git clone https://git.nuth.ch/manuth/PortValhalla.git;
 Set-Location PortValhalla;

winfs/Windows/System32/startnet.cmd

@@ -1,5 +1,5 @@
 echo Loading Drivers...
-X:\PowerShell\pwsh.exe -file "X:\Scripts\Drivers.ps1"
+X:\software\pwsh\pwsh.exe -file "X:\Scripts\Drivers.ps1"
 echo Configuring Network...
 wpeinit
 powercfg /s 8c5e7fda-e8bf-4a96-9a85-a6e23a8c635c