From cda38941b402926b3129ef979efb95456da04fe4 Mon Sep 17 00:00:00 2001
From: 5chdn <5chdn@users.noreply.github.com>
Date: Tue, 13 Feb 2018 22:06:32 +0100
Subject: [PATCH] Fix snapcraft nightly

---
 scripts/gitlab-build.sh |  2 +-
 scripts/snapcraft.yaml  | 22 ----------------------
 snap/snapcraft.yaml     |  4 ++--
 3 files changed, 3 insertions(+), 25 deletions(-)
 delete mode 100644 scripts/snapcraft.yaml

diff --git a/scripts/gitlab-build.sh b/scripts/gitlab-build.sh
index 600f2b39a..a12347593 100755
--- a/scripts/gitlab-build.sh
+++ b/scripts/gitlab-build.sh
@@ -310,7 +310,7 @@ case $BUILD_PLATFORM in
     ARC="amd64"
     EXT="snap"
     rm -rf *snap
-    sed -i 's/master/'"$VER"'/g' snapcraft.yaml
+    sed -i 's/git/'"$VER"'/g' snapcraft.yaml
     snapcraft
     cp "parity_"$CI_BUILD_REF_NAME"_amd64.snap" "parity_"$VER"_amd64.snap"
     $MD5_BIN "parity_"$VER"_amd64.snap" > "parity_"$VER"_amd64.snap.md5"
diff --git a/scripts/snapcraft.yaml b/scripts/snapcraft.yaml
deleted file mode 100644
index 3f4cf80ea..000000000
--- a/scripts/snapcraft.yaml
+++ /dev/null
@@ -1,22 +0,0 @@
-name: parity
-version: master
-summary: Fast, light, robust Ethereum implementation
-description: |
-  Parity's goal is to be the fastest, lightest, and most secure Ethereum
-  client. We are developing Parity using the sophisticated and cutting-edge
-  Rust programming language. Parity is licensed under the GPLv3, and can be
-  used for all your Ethereum needs.
-
-grade: devel
-confinement: strict
-
-apps:
-  parity:
-    command: parity
-    plugs: [network, network-bind]
-
-parts:
-  parity:
-    source: .
-    plugin: rust
-    build-packages: [g++, libudev-dev, libssl-dev, make, pkg-config]
diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index c0ca5507b..4cf423f26 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -16,11 +16,11 @@ apps:
     plugs: [home, network, network-bind, mount-observe, x11, unity7, desktop, desktop-legacy, wayland]
     desktop: usr/share/applications/parity.desktop
 
-icon: snap/gui/icon.png
+icon: ./gui/icon.png
 
 parts:
   desktop-icon:
-    source: ./snap
+    source: ../snap
     plugin: nil
     prepare: |
       mkdir -p $SNAPCRAFT_PART_INSTALL/usr/share/applications