From 36fdd024f8476ecd9a76de5610f104370a153570 Mon Sep 17 00:00:00 2001
From: Ben Gotow <ben@foundry376.com>
Date: Thu, 5 Oct 2017 13:30:01 -0700
Subject: [PATCH] =?UTF-8?q?Don=E2=80=99t=20upload=20extra=20snap=20files,?=
 =?UTF-8?q?=20use=20deb=20version=20for=20snap=20version?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .travis.yml         | 6 +++---
 snap/snapcraft.yaml | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index bc41e8954..e1cefef83 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -17,8 +17,8 @@ addons:
     - mailsync.tar.gz
     - Mailspring.dmg
     - Mailspring.zip
-    - $(find . -type f -name *.deb | tr "\n" ":")
-    - $(find . -type f -name *.rpm | tr "\n" ":")
+    - $(find . -type f -name mailspring-*.deb | tr "\n" ":")
+    - $(find . -type f -name mailspring-*.rpm | tr "\n" ":")
   apt:
     sources:
     - ubuntu-toolchain-r-test
@@ -103,5 +103,5 @@ deploy:
   'on':
     branch: master
   provider: script
-  script: docker run -v $(pwd):$(pwd) -t snapcore/snapcraft sh -c "apt update -qq && cd $(pwd) && snapcraft && snapcraft push *.snap --release edge"
+  script: docker run --env MAILSPRING_VERSION="$(grep -E -o '([0-9]+.[0-9]+.[0-9]+)' <<< "$(find app/dist -type f -name mailspring-*.deb)")" -v $(pwd):$(pwd) -t snapcore/snapcraft sh -c "apt update -qq && cd $(pwd) && snapcraft && snapcraft push *.snap --release edge"
   skip_cleanup: true
diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index 8acd90f40..aefcf3ac1 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -1,5 +1,5 @@
 name: mailspring
-version: 1.0.1
+version: $MAILSPRING_VERSION
 summary: The best email app for people and teams at work
 description: |
  An extensible desktop mail app built on the modern web.
@@ -9,7 +9,7 @@ confinement: strict
 parts:
   mailspring:
     plugin: dump
-    source: https://mailspring-builds.s3.amazonaws.com/client/ba1d6734/linux/mailspring-1.0.1-amd64.deb
+    source: ./app/dist/mailspring-$MAILSPRING_VERSION-amd64.deb
     source-type: deb
     # Correct path to icon.
     prepare: |