summaryrefslogtreecommitdiff
path: root/pkg
diff options
context:
space:
mode:
authorKali Kaneko <kali@leap.se>2016-04-18 12:54:18 -0700
committerKali Kaneko <kali@leap.se>2016-04-18 16:21:12 -0400
commit21bc3df30c7e280241472c58d74a96a6c84188eb (patch)
tree986d767b80d3098089dd522afc20b6e605a9aa2c /pkg
parent431d23021b5ac25c5a723e30698eb7465ad0949b (diff)
[pkg] move embedded copy of daemon to its own folder
Diffstat (limited to 'pkg')
-rw-r--r--pkg/osx/daemon/_metadata.py (renamed from pkg/osx/_metadata.py)0
-rw-r--r--pkg/osx/daemon/daemon.py (renamed from pkg/osx/daemon.py)0
-rw-r--r--pkg/osx/daemon/pidfile.py (renamed from pkg/osx/pidfile.py)0
-rw-r--r--pkg/osx/daemon/runner.py (renamed from pkg/osx/runner.py)0
-rw-r--r--pkg/pyinst/pyinst-build.mk6
5 files changed, 3 insertions, 3 deletions
diff --git a/pkg/osx/_metadata.py b/pkg/osx/daemon/_metadata.py
index 88843df7..88843df7 100644
--- a/pkg/osx/_metadata.py
+++ b/pkg/osx/daemon/_metadata.py
diff --git a/pkg/osx/daemon.py b/pkg/osx/daemon/daemon.py
index 7ca8770e..7ca8770e 100644
--- a/pkg/osx/daemon.py
+++ b/pkg/osx/daemon/daemon.py
diff --git a/pkg/osx/pidfile.py b/pkg/osx/daemon/pidfile.py
index 68f7b2ac..68f7b2ac 100644
--- a/pkg/osx/pidfile.py
+++ b/pkg/osx/daemon/pidfile.py
diff --git a/pkg/osx/runner.py b/pkg/osx/daemon/runner.py
index de9025d3..de9025d3 100644
--- a/pkg/osx/runner.py
+++ b/pkg/osx/daemon/runner.py
diff --git a/pkg/pyinst/pyinst-build.mk b/pkg/pyinst/pyinst-build.mk
index b96e5dab..756185bf 100644
--- a/pkg/pyinst/pyinst-build.mk
+++ b/pkg/pyinst/pyinst-build.mk
@@ -68,11 +68,11 @@ pyinst-helpers-osx:
cp pkg/osx/bitmask.pf.conf $(DIST_OSX_RES)bitmask-helper/
cp pkg/osx/se.leap.bitmask-helper.plist $(DIST_OSX_RES)bitmask-helper/
cp pkg/osx/post-inst.sh $(DIST_OSX_RES)bitmask-helper/
- cp pkg/osx/daemon.py $(DIST_OSX_RES)bitmask-helper/
+ cp pkg/osx/daemon/daemon.py $(DIST_OSX_RES)bitmask-helper/
cp /opt/homebrew-cask/Caskroom/tuntap/20150118/tuntap_20150118.pkg $(DIST_OSX_RES)
# TODO make the build script put it there
- cp ~/leap_thirdparty_build/openvpn.leap.polarssl $(DIST_OSX_RES)openvpn.leap
- cp ~/leap_thirdparty_build/gpg $(DIST_OSX)Contents/MacOS/apps/mail/
+ cp $(LEAP_BUILD_DIR)openvpn.leap.polarssl $(DIST_OSX_RES)openvpn.leap
+ cp $(LEAP_BUILD_DIR)gpg $(DIST_OSX)Contents/MacOS/apps/mail/
pyinst-tar:
cd dist/ && tar cvzf Bitmask.$(NEXT_VERSION).tar.gz bitmask-$(NEXT_VERSION)