From c90493a35aa04f63d628ae0d93e393df84be2724 Mon Sep 17 00:00:00 2001
From: "Kali Kaneko (leap communications)" <kali@leap.se>
Date: Wed, 4 Dec 2019 19:25:06 +0100
Subject: [pkg] fix icon in snap

Also, fix the version string reported in the dialog.
---
 branding/assets/calyx/icon.png                  | Bin 0 -> 18339 bytes
 branding/assets/riseup/icon.png                 | Bin 0 -> 16809 bytes
 branding/templates/snap/local/app.desktop       |   2 +-
 branding/templates/snap/snapcraft-template.yaml |   5 +++--
 4 files changed, 4 insertions(+), 3 deletions(-)
 create mode 100644 branding/assets/calyx/icon.png
 create mode 100755 branding/assets/riseup/icon.png

(limited to 'branding')

diff --git a/branding/assets/calyx/icon.png b/branding/assets/calyx/icon.png
new file mode 100644
index 0000000..5b0e175
Binary files /dev/null and b/branding/assets/calyx/icon.png differ
diff --git a/branding/assets/riseup/icon.png b/branding/assets/riseup/icon.png
new file mode 100755
index 0000000..492d850
Binary files /dev/null and b/branding/assets/riseup/icon.png differ
diff --git a/branding/templates/snap/local/app.desktop b/branding/templates/snap/local/app.desktop
index 7598fea..600a6a9 100644
--- a/branding/templates/snap/local/app.desktop
+++ b/branding/templates/snap/local/app.desktop
@@ -8,7 +8,7 @@ Comment[de]=Anonymous VPN
 Path=/snap/bin/
 Exec="/snap/bin/${binaryName}.launcher"
 Terminal=false
-Icon=/snap/${binaryName}/current/meta/gui/icon.svg
+Icon=${SNAP}/meta/gui/${binaryName}.png
 Categories=Network;Application;
 StartupNotify=true
 Keywords=VPN;${name};leap
diff --git a/branding/templates/snap/snapcraft-template.yaml b/branding/templates/snap/snapcraft-template.yaml
index 4b97e93..cef080b 100644
--- a/branding/templates/snap/snapcraft-template.yaml
+++ b/branding/templates/snap/snapcraft-template.yaml
@@ -7,7 +7,7 @@ description: |
         any way. The service is paid for entirely by donations from users like you.
 grade: stable
 confinement: classic
-icon: icon.svg 
+icon: snap/gui/icon.svg 
 base: core18
 
 parts:
@@ -34,6 +34,8 @@ parts:
                 go-packages:
                         - 0xacab.org/leap/bitmask-vpn/cmd/bitmask-vpn
                 override-build: |
+                      mkdir $SNAPCRAFT_PRIME/snap
+                      echo ${version} > $SNAPCRAFT_PRIME/snap/version.txt
                       mkdir -p $SNAPCRAFT_PRIME/usr/share/applications
                       cp $SNAPCRAFT_STAGE/../snap/local/${binaryName}.desktop $SNAPCRAFT_PRIME/usr/share/applications/${binaryName}.desktop
                       snapcraftctl build
@@ -54,7 +56,6 @@ parts:
 apps:
         launcher:
                 command: bin/bitmask-vpn
-                command-chain: [snap/command-chain/desktop-launch]
                 desktop: usr/share/applications/${binaryName}.desktop
                 environment:
                         LD_LIBRARY_PATH: "$SNAP/usr/lib/$(gcc -print-multiarch):$SNAP/lib/$(gcc -print-multiarch):$LD_LIBRARY_PATH"
-- 
cgit v1.2.3