From 043184cf530088425b9c5032da61966c0598ad7d Mon Sep 17 00:00:00 2001 From: Armin Schrenk Date: Fri, 18 Nov 2022 12:36:10 +0100 Subject: [PATCH] set loopback device alias during build instead of hardcode --- .github/workflows/win-exe.yml | 12 ++++++++++++ dist/win/build.ps1 | 9 +++++++++ dist/win/contrib/patchWebDAV.bat | 2 +- 3 files changed, 22 insertions(+), 1 deletion(-) diff --git a/.github/workflows/win-exe.yml b/.github/workflows/win-exe.yml index 46e1dbed1..dd2bdb8a2 100644 --- a/.github/workflows/win-exe.yml +++ b/.github/workflows/win-exe.yml @@ -22,6 +22,8 @@ jobs: build-msi: name: Build .msi Installer runs-on: windows-latest + env: + LOOPBACK_ALIAS: 'cryptomator-vault' steps: - uses: actions/checkout@v3 with: @@ -105,6 +107,16 @@ jobs: - name: Patch Application Directory run: | cp dist/win/contrib/* appdir/Cryptomator + - name: Set LOOPBACK_ALIAS in patchWebDAV.bat + shell: pwsh + run: | + $patchScript = "appdir\Cryptomator\patchWebDAV.bat" + try { + (Get-Content $patchScript ) -replace '::REPLACE ME', "SET LOOPBACK_ALIAS=`"${{ evn.LOOPBACK_ALIAS}}`"" | Set-Content $patchScript + } catch { + Write-Host "Failed to set LOOPBACK_ALIAS for patchWebDAV.bat" + exit 1 + } - name: Fix permissions run: attrib -r appdir/Cryptomator/Cryptomator.exe shell: pwsh diff --git a/dist/win/build.ps1 b/dist/win/build.ps1 index 50cdbd011..940384f64 100644 --- a/dist/win/build.ps1 +++ b/dist/win/build.ps1 @@ -105,6 +105,15 @@ if ($clean -and (Test-Path -Path $appPath)) { # patch app dir Copy-Item "contrib\*" -Destination "$AppName" attrib -r "$AppName\$AppName.exe" +# patch batch script to set hostfile +$webDAVPatcher = "$AppName\patchWebDAV.bat" +$alias = 'cryptomator-vault' +try { + (Get-Content $webDAVPatcher ) -replace '::REPLACE ME', "SET LOOPBACK_ALIAS=`"$alias`"" | Set-Content $webDAVPatcher +} catch { + Write-Host "Failed to set LOOPBACK_ALIAS for patchWebDAV.bat" + exit 1 +} # create .msi $Env:JP_WIXWIZARD_RESOURCES = "$buildDir\resources" diff --git a/dist/win/contrib/patchWebDAV.bat b/dist/win/contrib/patchWebDAV.bat index 1726147d2..aad226881 100644 --- a/dist/win/contrib/patchWebDAV.bat +++ b/dist/win/contrib/patchWebDAV.bat @@ -1,6 +1,6 @@ @echo off :: Default values for Cryptomator builds -SET LOOPBACK_ALIAS="cryptomator-vault" +::REPLACE ME cd %~dp0 powershell -NoLogo -NonInteractive -ExecutionPolicy Unrestricted -Command .\patchWebDAV.ps1^