From 93dfd356273dab444a624670e41ed5cf5a50535c Mon Sep 17 00:00:00 2001 From: Armin Schrenk Date: Tue, 21 Jan 2025 11:46:15 +0100 Subject: [PATCH] update Windows build scripts --- dist/win/build.bat | 2 +- dist/win/build.ps1 | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dist/win/build.bat b/dist/win/build.bat index 6dcb344c0..3532a69fd 100644 --- a/dist/win/build.bat +++ b/dist/win/build.bat @@ -11,7 +11,7 @@ SET HELP_URL="https://cryptomator.org/contact/" SET MODULE_AND_MAIN_CLASS="org.cryptomator.desktop/org.cryptomator.launcher.Cryptomator" SET LOOPBACK_ALIAS="cryptomator-vault" -powershell -NoLogo -NoProfile -ExecutionPolicy Unrestricted -Command .\build.ps1^ +pwsh -NoLogo -NoProfile -ExecutionPolicy Unrestricted -Command .\build.ps1^ -AppName %APPNAME%^ -MainJarGlob "%MAIN_JAR_GLOB%"^ -ModuleAndMainClass "%MODULE_AND_MAIN_CLASS%"^ diff --git a/dist/win/build.ps1 b/dist/win/build.ps1 index b4e27c1ae..a733f4557 100644 --- a/dist/win/build.ps1 +++ b/dist/win/build.ps1 @@ -60,14 +60,14 @@ if( !(Test-Path -Path $javaFxJmods) ) { Invoke-WebRequest $javaFxJmodsUrl -OutFile $javaFxJmods # redirects are followed by default } -$jmodsChecksumActual = $(Get-FileHash -Path $javaFxJmods -Algorithm SHA256).Hash +$jmodsChecksumActual = $(Get-FileHash -Path $javaFxJmods -Algorithm SHA256).Hash.ToLower() if( $jmodsChecksumActual -ne $javaFxJmodsSHA256 ) { Write-Error "Checksum mismatch for jfxJmods.zip. Expected: $javaFxJmodsSHA256 , actual: $jmodsChecksumActual" exit 1; } Expand-Archive -Path $javaFxJmods -Force -DestinationPath ".\resources\" -Remove-Item -Recurse -Force -Path ".\resources\javafx-jmods" +Remove-Item -Recurse -Force -Path ".\resources\javafx-jmods" -ErrorAction Ignore Move-Item -Force -Path ".\resources\javafx-jmods-*" -Destination ".\resources\javafx-jmods" -ErrorAction Stop ## create custom runtime