summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKali Kaneko (leap communications) <kali@leap.se>2018-10-04 22:59:33 +0200
committerKali Kaneko (leap communications) <kali@leap.se>2018-10-05 00:43:51 +0200
commitd9957cf6dc185dfc3c91e70fddd04e04e17c10cd (patch)
tree1b9484a979125f398e9152c98b9cf661b96da868
parent0ff0191696723fd5885885974d47a9d54d7944bf (diff)
[pkg] add build_snap target
-rwxr-xr-xMakefile7
-rwxr-xr-xsnap/hooks/install2
2 files changed, 5 insertions, 4 deletions
diff --git a/Makefile b/Makefile
index 189cdaf..127242b 100755
--- a/Makefile
+++ b/Makefile
@@ -91,10 +91,11 @@ build_osx: helper_osx systray_osx bundle_osx pkg_osx
# -----------------------------------------------------------------------------
build_snap:
-# TODO migrate here the snap folder in bitmask-dev.
-# We should transition pushing *this one* to edge (via launchpad) for some time, and when it's sufficiently tested
-# we can pin this repo as the only source for the snap.
echo "[+] building snap..."
+ snapcraft build
+ snapcraft snap
+ mkdir -p dist
+ mv riseup-vpn* dist/
# -----------------------------------------------------------------------------
# Utils
diff --git a/snap/hooks/install b/snap/hooks/install
index 70301c0..e51cdb5 100755
--- a/snap/hooks/install
+++ b/snap/hooks/install
@@ -16,7 +16,7 @@ with open('/usr/share/polkit-1/actions/se.leap.bitmask.riseupvpn.policy', 'w') a
release = subprocess.run(['cat', '/etc/os-release'], stdout=subprocess.PIPE).stdout
# this is a workaround for the fact that debian does not place snap desktop entries in a system+wide path.
-if b'ID=debian' in lines:
+if b'ID=debian' in release:
cmd = 'ln -s /snap/riseup-vpn/current/snap/gui/riseup-vpn.desktop /usr/share/applications/'
subprocess.run(cmd.split(' '))
subprocess.run(['update-desktop-database'])