summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKali Kaneko <kali@leap.se>2017-12-05 00:10:27 +0100
committerKali Kaneko <kali@leap.se>2017-12-20 15:36:31 +0100
commit133cd008f451ea997f1093490ca1ec097a17ae1b (patch)
treefbb6c4402730370d9f9687fe011dcd905c6f5c19
parentce351c5c1c29adb18f2afed701dba8bbfaeb65ac (diff)
[pkg] copy uninstaller to the bundle
-rw-r--r--pkg/bundles/build.mk2
-rwxr-xr-xpkg/osx/uninstall.sh4
2 files changed, 5 insertions, 1 deletions
diff --git a/pkg/bundles/build.mk b/pkg/bundles/build.mk
index a941fdf4..078a7501 100644
--- a/pkg/bundles/build.mk
+++ b/pkg/bundles/build.mk
@@ -78,6 +78,8 @@ bundle_osx_missing:
chmod +x $(OSX_RES)/openvpn.leap
cp ~/leap_thirdparty_build/gpg $(OSX_RES)/gpg
chmod +x $(OSX_RES)/gpg
+ cp release-notes.rst $(OSX_RES)/../../
+ cp pkg/osx/uninstall.sh $(OSX_RES)/../../
bundle_osx_pkg:
pkg/osx/quickpkg --output dist/Bitmask-$(NEXT_VERSION)_pre.pkg --scripts pkg/osx/scripts/ dist/Bitmask.app/
diff --git a/pkg/osx/uninstall.sh b/pkg/osx/uninstall.sh
index 7250020d..1fb6ff87 100755
--- a/pkg/osx/uninstall.sh
+++ b/pkg/osx/uninstall.sh
@@ -1,5 +1,7 @@
#!/bin/sh
-sudo launchctl unload /Library/LaunchDaemons/se.leap.bitmask-helper.plist
+HELPER_PLIST="/Library/LaunchDaemons/se.leap.bitmask-helper.plist"
+sudo launchctl unload $HELPER_PLIST
sudo rm -rf /Applications/Bitmask.app
sudo rm -rf ~/Library/Preferences/leap
+sudo rm $HELPER_PLIST
echo "Bitmask has been uninstalled from your system!"