From ceb5a5bafd28df9626f6300030ec2ede90b3f27b Mon Sep 17 00:00:00 2001
From: "Kali Kaneko (leap communications)" <kali@leap.se>
Date: Mon, 24 Jun 2019 18:44:14 +0200
Subject: take desktop file out of snap folder since it seems to be removed in
 the build

---
 gui/bitmask-vpn.desktop        | 15 +++++++++++++++
 snap/local/bitmask-vpn.desktop | 15 ---------------
 snap/snapcraft.yaml            |  8 ++++----
 3 files changed, 19 insertions(+), 19 deletions(-)
 create mode 100644 gui/bitmask-vpn.desktop
 delete mode 100644 snap/local/bitmask-vpn.desktop

diff --git a/gui/bitmask-vpn.desktop b/gui/bitmask-vpn.desktop
new file mode 100644
index 0000000..1fc7b48
--- /dev/null
+++ b/gui/bitmask-vpn.desktop
@@ -0,0 +1,15 @@
+[Desktop Entry]
+Version=1.0
+Type=Application
+Name=RiseupVPN
+Comment=Anonymous VPN
+Comment[es]=VPN Anonima
+Comment[de]=Anonymous VPN
+Path=/snap/bin/
+Exec="/snap/bin/riseup-vpn.launcher"
+Terminal=false
+Icon=/snap/riseup-vpn/current/meta/gui/icon.svg
+Categories=Network;Application;
+StartupNotify=true
+Keywords=VPN;riseup;leap
+
diff --git a/snap/local/bitmask-vpn.desktop b/snap/local/bitmask-vpn.desktop
deleted file mode 100644
index 1fc7b48..0000000
--- a/snap/local/bitmask-vpn.desktop
+++ /dev/null
@@ -1,15 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Type=Application
-Name=RiseupVPN
-Comment=Anonymous VPN
-Comment[es]=VPN Anonima
-Comment[de]=Anonymous VPN
-Path=/snap/bin/
-Exec="/snap/bin/riseup-vpn.launcher"
-Terminal=false
-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 165d3b9..594a234 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -59,10 +59,10 @@ parts:
                 override-build: |
                       echo ">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>" 
                       pwd
-                      apt install tree && tree
-                      ls -la .
-                      cat $SNAPCRAFT_PROJECT_DIR/snap/local/bitmask-vpn.desktop
-                      cp $SNAPCRAFT_PROJECT_DIR/snap/local/bitmask-vpn.desktop $SNAPCRAFT_PRIME/riseup-vpn.desktop
+                      #ls -la .
+                      #apt install tree && tree
+                      #cat $SNAPCRAFT_PROJECT_DIR/snap/local/bitmask-vpn.desktop
+                      cp gui/bitmask-vpn.desktop $SNAPCRAFT_PRIME/riseup-vpn.desktop
                       snapcraftctl build
                       echo ">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>" 
                 build-packages:
-- 
cgit v1.2.3