Replace winfsp-uninstaller by downloadlink

This commit is contained in:
Armin Schrenk
2023-07-19 16:24:44 +02:00
parent 315bf0d51f
commit b76a311ddc
6 changed files with 12 additions and 8 deletions

2
dist/win/.gitignore vendored
View File

@@ -4,4 +4,6 @@ installer
*.wixobj
*.pdb
*.msi
*.exe
*.jmod
license.rtf

7
dist/win/build.ps1 vendored
View File

@@ -171,10 +171,15 @@ $Env:JP_WIXWIZARD_RESOURCES = "$buildDir\resources"
"-Dlicense.licenseMergesUrl=file:///$buildDir/../../license/merges"
# download Winfsp
$winfspMsiUrl= (Select-String -Path ".\bundle\resources\winFspMetaData.wxi" -Pattern '<\?define BundledWinFspDownloadLink="(.+)".*?>').Matches.Groups[1].Value
$winfspMsiUrl= (Select-String -Path ".\bundle\resources\winfsp.url" -Pattern 'URL=(https://.+)$').Matches.Groups[1].Value
Write-Output "Downloading ${winfspMsiUrl}..."
Invoke-WebRequest $winfspMsiUrl -OutFile ".\bundle\resources\winfsp.msi" # redirects are followed by default
# download legacy-winfsp uninstaller
$winfspUninstaller= (Select-String -Path ".\bundle\resources\winfsp-uninstaller.url" -Pattern 'URL=(https://.+)$').Matches.Groups[1].Value
Write-Output "Downloading ${winfspUninstaller}..."
Invoke-WebRequest $winfspUninstaller -OutFile ".\bundle\resources\winfsp-uninstaller.exe" # redirects are followed by default
# copy MSI to bundle resources
Copy-Item ".\installer\$AppName-*.msi" -Destination ".\bundle\resources\$AppName.msi"

View File

@@ -1,7 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Include xmlns="http://schemas.microsoft.com/wix/2006/wi">
<!-- A version number MUST be prefixed with letter "v", otherwise it is considered a normal string -->
<?define BundledWinFspVersion="v1.12.22339" ?>
<?define BundledWinFspDownloadLink="https://github.com/winfsp/winfsp/releases/download/v1.12.22339/winfsp-1.12.22339.msi" ?> <!-- Only used by external build scripts -->
</Include>

View File

@@ -0,0 +1,2 @@
[InternetShortcut]
URL=https://github.com/cryptomator/winfsp-uninstaller/releases/download/1.0.0-beta3/winfsp-uninstaller.exe

2
dist/win/bundle/resources/winfsp.url vendored Normal file
View File

@@ -0,0 +1,2 @@
[InternetShortcut]
URL=https://github.com/winfsp/winfsp/releases/download/v2.0/winfsp-2.0.23075.msi