diff options
| author | kali <kali@leap.se> | 2019-06-20 01:22:08 +0200 |
|---|---|---|
| committer | Kali Kaneko (leap communications) <kali@leap.se> | 2019-06-21 12:47:08 +0200 |
| commit | 3d0af26a947d4cf62bc2b8ffffcac446bb228e8b (patch) | |
| tree | 42366d9e191c4b6cae4f1f761727f861e1c0d213 | |
| parent | 6085818d7befa28b7c80874b3b983a48f8f3f9bc (diff) | |
update snapcraft, move desktop to part
| -rw-r--r-- | snap/local/bitmask-vpn.desktop (renamed from snap/gui/riseup-vpn.desktop) | 6 | ||||
| -rw-r--r-- | snap/snapcraft.yaml | 34 |
2 files changed, 29 insertions, 11 deletions
diff --git a/snap/gui/riseup-vpn.desktop b/snap/local/bitmask-vpn.desktop index 5f36c09..1fc7b48 100644 --- a/snap/gui/riseup-vpn.desktop +++ b/snap/local/bitmask-vpn.desktop @@ -5,10 +5,10 @@ Name=RiseupVPN Comment=Anonymous VPN Comment[es]=VPN Anonima Comment[de]=Anonymous VPN -Path=/snap/bin -Exec=/snap/bin/riseup-vpn.launcher +Path=/snap/bin/ +Exec="/snap/bin/riseup-vpn.launcher" Terminal=false -Icon=/snap/riseup-vpn/current/snap/gui/icon.svg +Icon=/snap/riseup-vpn/current/meta/gui/icon.svg Categories=Network;Application; StartupNotify=true Keywords=VPN;riseup;leap diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml index acc471d..3f4d69c 100644 --- a/snap/snapcraft.yaml +++ b/snap/snapcraft.yaml @@ -11,9 +11,11 @@ description: | grade: stable confinement: classic icon: snap/gui/icon.svg +base: core18 parts: desktop-gtk3: + plugin: nil stage-packages: - libc6 prime: @@ -28,11 +30,16 @@ parts: bitmask-root: after: [desktop-gtk3] plugin: dump + plugin: nil + source: https://0xacab.org/leap/bitmask-dev/ + source-type: git build-packages: - wget override-prime: | - wget -O ./bin/bitmask-root https://0xacab.org/leap/bitmask-dev/raw/master/src/leap/bitmask/vpn/helpers/linux/bitmask-root - chmod +x ./bin/bitmask-root + echo ">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>" + pwd + wget -O bin/bitmask-root https://0xacab.org/leap/bitmask-dev/raw/master/src/leap/bitmask/vpn/helpers/linux/bitmask-root + chmod +x bin/bitmask-root openvpn: plugin: nil @@ -46,9 +53,19 @@ parts: bitmask-vpn: after: [desktop-gtk3] plugin: go - source: https://0xacab.org/leap/bitmask-vpn.git - go-importpath: 0xacab.org/leap/bitmask-vpn - # prepare: XXX run systray tests here + # XXX not needed? + #source: https://0xacab.org/leap/bitmask-vpn + source-type: git + go-packages: + - 0xacab.org/leap/bitmask-vpn/cmd/bitmask-vpn + override-build: | + echo ">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>" + pwd + ls -la .. + # TODO use the right PROJECTDIR env var + cat ../../../project/snap/local/bitmask-vpn.desktop + cp ../../../project/snap/local/bitmask-vpn.desktop ../../../prime/riseup-vpn.desktop + snapcraftctl build build-packages: - pkg-config - patchelf @@ -63,10 +80,11 @@ parts: apps: launcher: - command: ./bin/bitmask-vpn + command: bin/bitmask-vpn + desktop: riseup-vpn.desktop environment: LD_LIBRARY_PATH: "$SNAP/usr/lib/$(gcc -print-multiarch):$SNAP/lib/$(gcc -print-multiarch):$LD_LIBRARY_PATH" openvpn: - command: ./usr/sbin/openvpn + command: usr/sbin/openvpn bitmask-root: - command: ./bin/bitmask-root + command: bin/bitmask-root |