From 2b9558f720a0187a849889f25d9159603774a690 Mon Sep 17 00:00:00 2001 From: Manuel Thalmann Date: Fri, 26 Jul 2024 14:46:58 +0200 Subject: [PATCH] Pass label of setup disk as variable --- winiso/deploy.fish | 1 + winiso/winfs/Scripts/Startup.ps1 | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/winiso/deploy.fish b/winiso/deploy.fish index 4f7b1a9f..ce0d2934 100644 --- a/winiso/deploy.fish +++ b/winiso/deploy.fish @@ -131,6 +131,7 @@ begin $path \ "$git[4]\\bin" ) \ + "set SETUP_LABEL=$setupLabel" \ "set LOCAL_PROJECT_PATH=$(echo "$localProjectPath" | mkWinPath)" \ "set REMOTE_PROJECT_PATH=$(echo "$projectPath" | mkWinPath)" \ "echo Loading Drivers..." \ diff --git a/winiso/winfs/Scripts/Startup.ps1 b/winiso/winfs/Scripts/Startup.ps1 index 7d641edd..7f62013e 100644 --- a/winiso/winfs/Scripts/Startup.ps1 +++ b/winiso/winfs/Scripts/Startup.ps1 @@ -1,3 +1,3 @@ $drives = & wmic volume get "DriveLetter,Label"; -$env:INSTALLER_DRIVE = $($($drives | Select-String -Pattern "winiso-valhalla") -split "\s+")[0]; -Set-Location (Join-Path $env:INSTALLER_DRIVE $env:LOCAL_PROJECT_PATH) +$env:SETUP_DRIVE = $($($drives | Select-String -Pattern "$env:SETUP_LABEL") -split "\s+")[0]; +Set-Location (Join-Path $env:SETUP_DRIVE $env:LOCAL_PROJECT_PATH)