From 9d78c1a551a6a470e9735fb2802ee470f6131266 Mon Sep 17 00:00:00 2001
From: cevap <dev@i2pmail.org>
Date: Thu, 7 Feb 2019 17:14:16 +0100
Subject: [PATCH] snap: reduce snap size by using only one binary

closes https://github.com/ioncoincore/ion/projects/11#card-17385306
---
 snap/snapcraft.yaml                           | 22 -------------------
 .../usr/share/applications/qt-regtest.desktop |  2 +-
 .../usr/share/applications/qt-testnet.desktop |  2 +-
 3 files changed, 2 insertions(+), 24 deletions(-)

diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index 45e1d0fe675c1..6d62defc8d754 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -40,35 +40,13 @@ apps:
     plugs: [network, network-bind, home, removable-media]
     environment:
       XDG_DATA_DIRS: $SNAP_USER_DATA:$SNAP/usr/share:$XDG_DATA_DIRS
-  daemon-testnet:
-    command: iond --testnet
-    plugs: [network, network-bind, home, removable-media]
-    environment:
-      XDG_DATA_DIRS: $SNAP_USER_DATA:$SNAP/usr/share:$XDG_DATA_DIRS
-  daemon-regtest:
-    command: iond --regtest
-    plugs: [network, network-bind, home, removable-media]
   qt:
     command: desktop-launch ion-qt
     plugs: [network, network-bind, unity7, unity8-calendar, unity8-contacts, desktop, desktop-legacy, wayland, x11, mir, opengl, home, removable-media]
     desktop: qt.desktop
-  qt-testnet:
-    command: desktop-launch ion-qt --testnet
-    plugs: [network, network-bind, unity7, unity8-calendar, unity8-contacts, desktop, desktop-legacy, wayland, x11, mir, opengl, home, removable-media]
-    desktop: qt-testnet.desktop
-  qt-regtest:
-    command: desktop-launch ion-qt --regtest
-    plugs: [network, network-bind, unity7, unity8-calendar, unity8-contacts, desktop, desktop-legacy, wayland, x11, mir, opengl, home, removable-media]
-    desktop: qt-regtest.desktop
   cli:
     command: ion-cli
     plugs: [network, network-bind, home]
-  cli-testnet:
-    command: ion-cli --testnet
-    plugs: [network, network-bind, home]
-  cli-regtest:
-    command: ion-cli --regtest
-    plugs: [network, network-bind, home]
   tx:
     command: ion-tx
     plugs: [home]
diff --git a/snap/usr/share/applications/qt-regtest.desktop b/snap/usr/share/applications/qt-regtest.desktop
index 6058b10beab30..34d9b064eddcc 100644
--- a/snap/usr/share/applications/qt-regtest.desktop
+++ b/snap/usr/share/applications/qt-regtest.desktop
@@ -7,7 +7,7 @@ Encoding=UTF-8
 Name=Ion Qt Regtest
 Icon=${SNAP}/qt-regtest.ico
 MimeType=x-scheme-handler/ioncore;
-Exec=ioncore.qt-regtest %u
+Exec=ioncore.qt --regtest %u
 Terminal=false
 Categories=Office;Finance;Games;
 Comment=Ion Digital Currency QT Official release
diff --git a/snap/usr/share/applications/qt-testnet.desktop b/snap/usr/share/applications/qt-testnet.desktop
index 85a6acf3bec2e..a416a3c0cbe06 100644
--- a/snap/usr/share/applications/qt-testnet.desktop
+++ b/snap/usr/share/applications/qt-testnet.desktop
@@ -7,7 +7,7 @@ Encoding=UTF-8
 Name=Ion Qt Testnet
 Icon=${SNAP}/qt-testnet.ico
 MimeType=x-scheme-handler/ioncore;
-Exec=ioncore.qt-testnet --testnet %u
+Exec=ioncore.qt --testnet %u
 Terminal=false
 Categories=Office;Finance;Games;
 Comment=Ion Digital Currency QT Official release