From d9957cf6dc185dfc3c91e70fddd04e04e17c10cd Mon Sep 17 00:00:00 2001 From: "Kali Kaneko (leap communications)" Date: Thu, 4 Oct 2018 22:59:33 +0200 Subject: [pkg] add build_snap target --- Makefile | 7 ++++--- snap/hooks/install | 2 +- 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']) -- cgit v1.2.3