From 90d43f28d9bfac49c968f727060e1b33fe8681e6 Mon Sep 17 00:00:00 2001 From: Armin Schrenk Date: Wed, 11 May 2022 12:25:53 +0200 Subject: [PATCH] eradicate last hard coded app name occurences in build script --- dist/win/build.ps1 | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/dist/win/build.ps1 b/dist/win/build.ps1 index 84900f9ff..25b4cfea8 100644 --- a/dist/win/build.ps1 +++ b/dist/win/build.ps1 @@ -1,6 +1,5 @@ Param( [Parameter(Mandatory, HelpMessage="Please provide a name for the app")][string] $AppName, - [Parameter(Mandatory, HelpMessage="Please provide a valud path to an icon file")][string] $IconPath, [Parameter(Mandatory, HelpMessage="Please provide the name of the vendor")][string] $Vendor, [Parameter(Mandatory, HelpMessage="Please provide the starting year for the copyright notice")][int] $CopyrightStartYear, [Parameter(Mandatory, HelpMessage="Please provide a help url")][string] $HelpUrl, @@ -86,7 +85,7 @@ if ($clean -and (Test-Path -Path $appPath)) { --java-options "-Dcryptomator.showTrayIcon=true" ` --java-options "-Dcryptomator.buildNumber=`"msi-$revisionNo`"" ` --resource-dir resources ` - --icon resources/Cryptomator.ico + --icon resources/$AppName.ico #Create RTF license for msi &mvn -B -f $buildDir/../../pom.xml license:add-third-party ` @@ -108,7 +107,7 @@ $Env:JP_WIXWIZARD_RESOURCES = "$buildDir\resources" --verbose ` --type msi ` --win-upgrade-uuid bda45523-42b1-4cae-9354-a45475ed4775 ` - --app-image Cryptomator ` + --app-image $AppName ` --dest installer ` --name $AppName ` --vendor $Vendor ` @@ -152,4 +151,4 @@ Copy-Item ".\installer\$AppName-*.msi" -Destination ".\bundle\resources\$AppName -dAboutUrl="$AboutUrl" ` -dHelpUrl="$HelpUrl" ` -dUpdateUrl="$UpdateUrl" -& "$env:WIX\bin\light.exe" -b . .\bundle\BundlewithWinfsp.wixobj -ext WixBalExtension -out installer\Cryptomator-Installer.exe \ No newline at end of file +& "$env:WIX\bin\light.exe" -b . .\bundle\BundlewithWinfsp.wixobj -ext WixBalExtension -out installer\$AppName-Installer.exe \ No newline at end of file