diff --git a/bitmask.pro b/bitmask.pro index 4099301b24750e070b1530ce1edd172c8e64aee2..efce9ef95bfb3185a408bd65458611b271bb6f5d 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 936726df2739d87f8a546ace5719aad0604064cf..94d76b6f41d2c5a7f29617af3f86ac23eae4e48a 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 32b4780d5d16d8ddc541da298fd612b30e1b9a74..18059aa12fa24283a45bb61f0723cb576f7df679 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 c9d968701af75ff0b5cc74b3f95ed4ae19e426df..c333abafe7c6ec2e2a24c028ee05d3d32835346e 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>