From 9ee4859558b868f01012c39dd98bf292d64e09f0 Mon Sep 17 00:00:00 2001
From: Kali Kaneko <kali@leap.se>
Date: Mon, 5 Mar 2018 17:55:29 +0100
Subject: [pkg] minor adjustments for riseupvpn osx bundle

- duplicate the scripts folder for riseupvpn
- fix renaming of helper
- set openvpn path for riseupvpn
---
 pkg/osx/scripts-riseupvpn/postinstall              | 13 +++++++++++
 pkg/osx/scripts-riseupvpn/preinstall               | 12 ++++++++++
 .../scripts-riseupvpn/se.leap.bitmask-helper.plist | 26 ++++++++++++++++++++++
 3 files changed, 51 insertions(+)
 create mode 100755 pkg/osx/scripts-riseupvpn/postinstall
 create mode 100755 pkg/osx/scripts-riseupvpn/preinstall
 create mode 100644 pkg/osx/scripts-riseupvpn/se.leap.bitmask-helper.plist

(limited to 'pkg/osx')

diff --git a/pkg/osx/scripts-riseupvpn/postinstall b/pkg/osx/scripts-riseupvpn/postinstall
new file mode 100755
index 00000000..93430390
--- /dev/null
+++ b/pkg/osx/scripts-riseupvpn/postinstall
@@ -0,0 +1,13 @@
+#!/bin/sh
+# Bitmask Post-Instalation script
+# (c) LEAP Encryption access Project
+# We copy the bitmask-helper plist to the LaunchDaemons folder, and load the bitmask-helper that runs as root.
+
+LOG=/tmp/bitmask-install.log
+
+chmod +x /Applications/RiseupVPN.app/Contents/Resources/bitmask-helper/bitmask-helper
+cp se.leap.bitmask-helper.plist /Library/LaunchDaemons/ \
+	&& echo `date` ":: Bitmask post-install: copied bitmask-helper Plist." >> $LOG
+launchctl load /Library/LaunchDaemons/se.leap.bitmask-helper.plist && echo `date` ":: Bitmask post-install: loaded bitmask-helper." >> $LOG
+echo `date` ":: Bitmask post-install: ok." >> $LOG
+exit 0
diff --git a/pkg/osx/scripts-riseupvpn/preinstall b/pkg/osx/scripts-riseupvpn/preinstall
new file mode 100755
index 00000000..1ae68f9c
--- /dev/null
+++ b/pkg/osx/scripts-riseupvpn/preinstall
@@ -0,0 +1,12 @@
+#!/bin/sh
+# Bitmask Pre-Instalation script
+# (c) LEAP Encryption access Project
+# We unload the bitmask-helper if it is running, because we can be installing an upgrade.
+
+LOG=/tmp/bitmask-install.log
+
+ps aux | grep [b]itmask-helper \
+	&& launchctl unload /Library/LaunchDaemons/se.leap.bitmask-helper.plist \
+	&& echo `date` ":: Bitmask pre-install: unloaded bitmask-helper." >> $LOG
+echo `date` ":: Bitmask pre-install: ok." >> $LOG
+exit 0
diff --git a/pkg/osx/scripts-riseupvpn/se.leap.bitmask-helper.plist b/pkg/osx/scripts-riseupvpn/se.leap.bitmask-helper.plist
new file mode 100644
index 00000000..8ebfb947
--- /dev/null
+++ b/pkg/osx/scripts-riseupvpn/se.leap.bitmask-helper.plist
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>WorkingDirectory</key>
+	<string>/Applications/RiseupVPN.app/Contents/Resources/bitmask-helper/</string>
+	<key>StandardOutPath</key>
+	<string>bitmask-helper.log</string>
+	<key>StandardErrorPath</key>
+	<string>bitmask-helper-err.log</string>
+	<key>GroupName</key>
+	<string>daemon</string>
+	<key>RunAtLoad</key>
+	<true/>
+	<key>SessionCreate</key>
+	<true/>
+	<key>KeepAlive</key>
+    <true/>
+    <key>ThrottleInterval</key>
+    <integer>5</integer>
+    <key>Label</key>
+	<string>se.leap.BitmaskHelper</string>
+	<key>Program</key>
+    <string>/Applications/RiseupVPN.app/Contents/Resources/bitmask-helper/bitmask-helper</string>
+</dict>
+</plist>
-- 
cgit v1.2.3