[pkg] fix icon in snap

Also, fix the version string reported in the dialog.

5 files changed, 5 insertions, 3 deletions

diff --git a/Makefile b/Makefile
index 4bf8c55..b15bed4 100644
--- a/Makefile
+++ b/Makefile
@@ -177,6 +177,7 @@ gen_pkg_snap:
 	@cd build/${PROVIDER}/snap && python3 generate.py
 	@rm build/${PROVIDER}/snap/data.json build/${PROVIDER}/snap/snapcraft-template.yaml
 	@mkdir -p build/${PROVIDER}/snap/gui && cp branding/assets/default/icon.svg build/${PROVIDER}/snap/gui/icon.svg
+	@cp branding/assets/default/icon.png build/${PROVIDER}/snap/gui/${PROVIDER}-vpn.png
 
 gen_pkg_deb:
 	@cp -r ${TEMPLATES}/debian build/${PROVIDER}
diff --git a/branding/assets/calyx/icon.png b/branding/assets/calyx/icon.png
new file mode 100644
index 0000000..5b0e175
--- /dev/null
+++ b/branding/assets/calyx/icon.png
diff --git a/branding/assets/riseup/icon.png b/branding/assets/riseup/icon.png
new file mode 100755
index 0000000..492d850
--- /dev/null
+++ b/branding/assets/riseup/icon.png
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"