From 0fe7de180f7a0311b092bf2e31a043138a59fcf6 Mon Sep 17 00:00:00 2001
From: "Kali Kaneko (leap communications)" <kali@leap.se>
Date: Thu, 31 Jan 2019 23:08:25 +0100
Subject: [pkg] update osx scripts after repo rename

---
 Makefile               | 4 ++--
 osx/generate.py        | 2 +-
 osx/scripts/preinstall | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index 09eaf84..2360e18 100755
--- a/Makefile
+++ b/Makefile
@@ -79,7 +79,7 @@ helper_osx:
 	go build -ldflags "-s -w" -o $(STAGING)/$(HELPER_BIN) $(SYSTRAY)/cmd/bitmask-helper
 	upx $(STAGING)/$(HELPER_BIN)
 systray_osx:
-	go get -u $(SYSTRAY)
+	go get -u $(SYSTRAY)/cmd/bitmask-vpn
 	go build -ldflags "-X main.version=$(VERSION)" -o $(STAGING)/$(SYSTRAY_BIN) $(SYSTRAY)/cmd/bitmask-vpn
 	upx $(STAGING)/$(SYSTRAY_BIN)
 bundle_osx:
@@ -93,7 +93,7 @@ pkg_osx:
 		echo "[+] Signing the bundle";\
 		productsign --sign $(OSX_CERT) dist/$(APP_NAME)-$(VERSION)_unsigned.pkg dist/$(APP_NAME)-$(VERSION).pkg;\
 	fi
-build_osx: helper_osx systray_osx bundle_osx pkg_osx
+build_osx: openvpn_osx helper_osx systray_osx bundle_osx pkg_osx
 	echo "[+] building osx..."
 
 # -----------------------------------------------------------------------------
diff --git a/osx/generate.py b/osx/generate.py
index e76a291..387830a 100644
--- a/osx/generate.py
+++ b/osx/generate.py
@@ -22,7 +22,7 @@ BUNDLE_IDENTIFIER = "se.leap.riseupvpn"
 
 here = os.path.split(os.path.abspath(__file__))[0]
 
-ENTRYPOINT = 'bitmask-systray'
+ENTRYPOINT = 'bitmask-vpn'
 HELPER = 'bitmask_helper'
 OPENVPN = 'openvpn'
 TEMPLATE_INFO = 'template-info.plist'
diff --git a/osx/scripts/preinstall b/osx/scripts/preinstall
index fc18c17..d7104e9 100755
--- a/osx/scripts/preinstall
+++ b/osx/scripts/preinstall
@@ -8,5 +8,5 @@ LOG=/tmp/bitmask-install.log
 ps aux | grep [b]itmask_helper \
 	&& launchctl unload /Library/LaunchDaemons/se.leap.bitmask-helper.plist \
 	&& echo `date` ":: RiseupVPN pre-install: unloaded bitmask-helper." >> $LOG
-echo `date` ":: RiseupVPN pre-install: done." >> $LOG
+echo `date` ":: RiseupVPN pre-install: ok." >> $LOG
 exit 0
-- 
cgit v1.2.3