From 19d7aa09f3f2b4c0182fa5a8a020167cb60f3116 Mon Sep 17 00:00:00 2001
From: Armin Schrenk <armin.schrenk@skymatic.de>
Date: Tue, 3 Aug 2021 16:50:23 +0200
Subject: [PATCH] use multiline command for msi job

---
 .github/workflows/build.yml | 37 ++++++++++++++++---------------------
 1 file changed, 16 insertions(+), 21 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 7bb53965a..f72946eb5 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -430,7 +430,6 @@ jobs:
           cp dist/win/contrib/* appdir/Cryptomator
       - name: Fix permissions
         run: attrib -r appdir/Cryptomator/Cryptomator.exe
-        shell: pwsh
       - name: Codesign
         uses: skymatic/code-sign-action@v1.0.1
         with:
@@ -440,27 +439,23 @@ jobs:
           timestampUrl: 'http://timestamp.digicert.com'
           folder: appdir/Cryptomator
           recursive: true
-      - name: Prepare env for building msi
-        run: |
-          $path = (Get-Location).Path + "\dist\win\resources" 
-          [Environment]::SetEnvironmentVariable("JpackageWixWizardResources", $path, 'Machine')
-        shell: pwsh
       - name: Create MSI
-        run: >
-          ${JAVA_HOME}/bin/jpackage
-          --verbose
-          --type msi
-          --win-upgrade-uuid bda45523-42b1-4cae-9354-a45475ed4775
-          --app-image appdir/Cryptomator
-          --dest installer
-          --name Cryptomator
-          --vendor "Skymatic GmbH"
-          --copyright "(C) 2016 - 2021 Skymatic GmbH"
-          --app-version "${{ needs.metadata.outputs.versionNum }}"
-          --win-shortcut 
-          --win-menu 
-          --win-dir-chooser 
-          --resource-dir dist/win/resources 
+        run: |
+          $Env:JpackageWixWizardResources = (Get-Location).Path + "\dist\win\resources" 
+          ${JAVA_HOME}/bin/jpackage `
+          --verbose `
+          --type msi `
+          --win-upgrade-uuid bda45523-42b1-4cae-9354-a45475ed4775 `
+          --app-image appdir/Cryptomator `
+          --dest installer `
+          --name Cryptomator `
+          --vendor "Skymatic GmbH" `
+          --copyright "(C) 2016 - 2021 Skymatic GmbH" `
+          --app-version "${{ needs.metadata.outputs.versionNum }}" `
+          --win-shortcut `
+          --win-menu `
+          --win-dir-chooser `
+          --resource-dir dist/win/resources `
           --license-file dist/win/resources/license.rtf
       - name: Codesign MSI
         uses: skymatic/code-sign-action@v1.0.1