diff options
| author | kali <kali@win> | 2020-09-25 17:46:50 +0200 |
|---|---|---|
| committer | kali kaneko (leap communications) <kali@leap.se> | 2020-09-25 21:00:08 +0200 |
| commit | 5d102497e80f17056ce97bcc58a4906cf8a05c28 (patch) | |
| tree | 3052ed39a403fc4f73d7d73f60597caaca9d2a75 /branding | |
| parent | 5518645dfdfd1250dcabd98bda5d71d18eb4edcc (diff) | |
[bug] workaround for helper path in windows
Diffstat (limited to 'branding')
| -rw-r--r-- | branding/qtinstaller/config/config.xml | 9 | ||||
| -rw-r--r-- | branding/qtinstaller/packages/root.win_x86_64/meta/installscript.js | 6 |
2 files changed, 11 insertions, 4 deletions
diff --git a/branding/qtinstaller/config/config.xml b/branding/qtinstaller/config/config.xml index 4469d65..8ce9b2e 100644 --- a/branding/qtinstaller/config/config.xml +++ b/branding/qtinstaller/config/config.xml @@ -1,9 +1,14 @@ <?xml version="1.0" encoding="UTF-8"?> <Installer> - <Name>DemoLibVPN</Name> + <Name>DemoLibVPN-0.0.1</Name> <Version>0.0.1</Version> <Title>DemoLibVPN Installer</Title> <Publisher>LEAP Encryption Access Project</Publisher> - <StartMenuDir>DemoLibVPN</StartMenuDir> <TargetDir>@ApplicationsDir@/DemoLibVPN</TargetDir> + <RunProgram>@TargetDir@/demolib-vpn.exe</RunProgram> + <RunProgramArguments> + </RunProgramArguments> + <StartMenuDir>DemoLibVPN</StartMenuDir> + <MaintenanceToolName>Uninstall-DemoLibVPN</MaintenanceToolName> + <AllowNonAsciiCharacters>false</AllowNonAsciiCharacters> </Installer> diff --git a/branding/qtinstaller/packages/root.win_x86_64/meta/installscript.js b/branding/qtinstaller/packages/root.win_x86_64/meta/installscript.js index 691d1a4..1598458 100644 --- a/branding/qtinstaller/packages/root.win_x86_64/meta/installscript.js +++ b/branding/qtinstaller/packages/root.win_x86_64/meta/installscript.js @@ -69,7 +69,9 @@ Component.prototype.createOperations = function() if (systemInfo.productType === "windows") { console.log("Adding shortcut entries"); component.addElevatedOperation("Mkdir", "@StartMenuDir@"); - component.addElevatedOperation("CreateShortcut", "@TargetDir@/demolib-vpn.exe", "@StartMenuDir@/DemoLibVPN.lnk", "workingDirectory=@TargetDir@", "iconPath=%SystemRoot%/system32/SHELL32.dll", "iconId=2", "description=Start DemoLibVPN"); - component.addElevatedOperation("CreateShortcut", "@TargetDir@/maintenancetool.exe", "@StartMenuDir@/uninstall.lnk", "workingDirectory=@TargetDir@", "iconPath=%SystemRoot%/system32/SHELL32.dll", "iconId=2", "description=Uninstall application"); + component.addElevatedOperation("CreateShortcut", "@TargetDir@/demolib-vpn.exe", "@StartMenuDir@/DemoLibVPN.lnk", "workingDirectory=@TargetDir@", "iconPath=@TargetDir@/icon.ico", "description=Start DemoLibVPN"); + + // TODO I think this one is not being created because the path doesn't exist yet. We might want to do this by hooking on the installation finished signal instead. + component.addElevatedOperation("CreateShortcut", "@TargetDir@/Uninstall-DemoLibVPN.exe", "@StartMenuDir@/Uninstall.lnk"); } } |