diff options
| author | kali <kali@leap.se> | 2020-10-02 19:44:53 +0200 |
|---|---|---|
| committer | Ruben Pollan <meskio@sindominio.net> | 2020-10-13 19:08:45 +0200 |
| commit | 0a432c12feb280b72ed17714bbd3a9d518c9308a (patch) | |
| tree | d42d374557955f4195d07a3905eb7ed31287098e | |
| parent | ef892643df8970aec45dbc3f48eabb95a1ccbf22 (diff) | |
[pkg] launch helper from the right path
| -rw-r--r-- | bitmask.pro | 2 | ||||
| -rw-r--r-- | branding/templates/qtinstaller/config/config.xml | 6 | ||||
| -rwxr-xr-x | branding/templates/qtinstaller/osx/post-install.py | 5 | ||||
| -rw-r--r-- | branding/templates/qtinstaller/osx/se.leap.bitmask-helper.plist | 6 |
4 files changed, 12 insertions, 7 deletions
diff --git a/bitmask.pro b/bitmask.pro index 4099301..efce9ef 100644 --- a/bitmask.pro +++ b/bitmask.pro @@ -8,7 +8,7 @@ QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.12 macx { LIBS += -framework Security - ICON = ./branding/assets/riseup/icon.icns + ICON = branding/assets/riseup/icon.icns } QT += qml quick widgets diff --git a/branding/templates/qtinstaller/config/config.xml b/branding/templates/qtinstaller/config/config.xml index 936726d..94d76b6 100644 --- a/branding/templates/qtinstaller/config/config.xml +++ b/branding/templates/qtinstaller/config/config.xml @@ -4,11 +4,11 @@ <Version>0.0.1</Version> <Title>DemoLibVPN Installer</Title> <Publisher>LEAP Encryption Access Project</Publisher> - <TargetDir>@ApplicationsDir@/DemoLibVPN</TargetDir> - <RunProgram>@TargetDir@/demolib-vpn.app</RunProgram> + <TargetDir>@ApplicationsDir@/DemoLibVPN.app</TargetDir> + <RunProgram>@TargetDir@/DemoLibVPN.app</RunProgram> <RunProgramArguments> </RunProgramArguments> - <StartMenuDir>DemoLibVPN</StartMenuDir> + <StartMenuDir>DemoLibVPN.app</StartMenuDir> <AllowNonAsciiCharacters>false</AllowNonAsciiCharacters> <!-- <RemoteRepositories> diff --git a/branding/templates/qtinstaller/osx/post-install.py b/branding/templates/qtinstaller/osx/post-install.py index 32b4780..18059aa 100755 --- a/branding/templates/qtinstaller/osx/post-install.py +++ b/branding/templates/qtinstaller/osx/post-install.py @@ -1,5 +1,10 @@ #!/usr/bin/env python +# Post installation script for BitmaskVPN. +# Please note that this installation will install ONE single helper with administrative privileges. +# This means that, for the time being, you can only install ONE of the BitmaskVPN derivatives at the same time. +# This might change in the future. + import os import shutil import sys diff --git a/branding/templates/qtinstaller/osx/se.leap.bitmask-helper.plist b/branding/templates/qtinstaller/osx/se.leap.bitmask-helper.plist index c9d9687..c333aba 100644 --- a/branding/templates/qtinstaller/osx/se.leap.bitmask-helper.plist +++ b/branding/templates/qtinstaller/osx/se.leap.bitmask-helper.plist @@ -3,11 +3,11 @@ <plist version="1.0"> <dict> <key>WorkingDirectory</key> - <string>/tmp</string> + <string>PATH</string> <key>StandardOutPath</key> - <string>bitmask-helper.log</string> + <string>PATH/helper/bitmask-helper.log</string> <key>StandardErrorPath</key> - <string>bitmask-helper-err.log</string> + <string>PATH/helper/bitmask-helper-err.log</string> <key>GroupName</key> <string>daemon</string> <key>RunAtLoad</key> |