From 2c51c4d186134829aa84c1c07373f20cd2ebd277 Mon Sep 17 00:00:00 2001
From: vdo <vdo@greyfaze.net>
Date: Fri, 24 Feb 2017 02:20:02 +0100
Subject: [PATCH] Reorganize snap. Add daemon wrapper

---
 contrib/snap/daemon.bash                      | 12 ------------
 contrib/snap/log.bash                         |  3 ---
 contrib/snap/monerod-wrapper                  |  8 ++++++++
 contrib/snap/monerod.conf                     |  9 +++++++++
 snapcraft.yaml => contrib/snap/snapcraft.yaml | 18 ++++++++++++++----
 contrib/snap/wallet.bash                      |  7 -------
 6 files changed, 31 insertions(+), 26 deletions(-)
 delete mode 100755 contrib/snap/daemon.bash
 delete mode 100755 contrib/snap/log.bash
 create mode 100644 contrib/snap/monerod-wrapper
 create mode 100644 contrib/snap/monerod.conf
 rename snapcraft.yaml => contrib/snap/snapcraft.yaml (76%)
 delete mode 100755 contrib/snap/wallet.bash

diff --git a/contrib/snap/daemon.bash b/contrib/snap/daemon.bash
deleted file mode 100755
index 41d1275d..00000000
--- a/contrib/snap/daemon.bash
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/bash -e
-
-export LD_LIBRARY_PATH=${SNAP_LIBRARY_PATH}:${SNAP}/usr/lib/x86_64-linux-gnu
-export HOME=${SNAP_DATA}
-cd ${SNAP_DATA}
-
-ARGS=
-if [ -e "${SNAP_DATA}/etc/monerod.conf" ]; then
-	ARGS="--config-file ${SNAP_DATA}/etc/monerod.conf"
-fi
-
-exec ${SNAP}/bin/monerod --detach $ARGS
diff --git a/contrib/snap/log.bash b/contrib/snap/log.bash
deleted file mode 100755
index c81efeb2..00000000
--- a/contrib/snap/log.bash
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/bash -e
-
-exec tail -c +0 -F ${SNAP_DATA}/.bitmonero/bitmonero.log
diff --git a/contrib/snap/monerod-wrapper b/contrib/snap/monerod-wrapper
new file mode 100644
index 00000000..f7266e11
--- /dev/null
+++ b/contrib/snap/monerod-wrapper
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+if [ ! -d "$SNAP_USER_DATA/etc" ]; then
+  mkdir $SNAP_USER_DATA/etc/
+  cp -R $SNAP/etc/monerod.conf $SNAP_USER_DATA/etc/monerod.conf
+fi
+
+exec "$SNAP/bin/monerod" "$@"
diff --git a/contrib/snap/monerod.conf b/contrib/snap/monerod.conf
new file mode 100644
index 00000000..9b3d308e
--- /dev/null
+++ b/contrib/snap/monerod.conf
@@ -0,0 +1,9 @@
+# Configuration for monerod
+# Syntax: any command line option may be specified as 'clioptionname=value'.
+# See 'monerod --help' for all available options.
+
+# Overrided by snap:
+# data-dir=/var/lib/monero
+# log-file=/var/log/monero/monero.log
+
+log-level=0
diff --git a/snapcraft.yaml b/contrib/snap/snapcraft.yaml
similarity index 76%
rename from snapcraft.yaml
rename to contrib/snap/snapcraft.yaml
index 17910392..8ed4413a 100644
--- a/snapcraft.yaml
+++ b/contrib/snap/snapcraft.yaml
@@ -1,5 +1,5 @@
 name: monero
-version: 0.10.1 # Current stable version
+version: 0.10.2-1
 summary: "Monero: the secure, private, untraceable cryptocurrency https://getmonero.org"
 description: |
     Monero is a private, secure, untraceable, decentralised digital currency.
@@ -12,20 +12,20 @@ apps:
     monerod:
         daemon: forking
         command: |
-          monerod --detach --data-dir ${SNAP_DATA}
+          monerod-wrapper --detach --data-dir ${SNAP_COMMON} --config-file ${SNAP_USER_DATA}/etc/monerod.conf
         plugs:
             - network
             - network-bind
     monero-wallet-rpc:
         command: |
-            monero-wallet-rpc --log-file ${SNAP_USER_DATA}
+          monero-wallet-rpc --log-file ${SNAP_USER_DATA}
         plugs:
             - home
             - network
             - network-bind
     monero-wallet-cli:
         command: |
-            monero-wallet-cli --log-file ${SNAP_USER_DATA}
+          monero-wallet-cli --log-file ${SNAP_USER_DATA}
         plugs:
             - home
             - network
@@ -63,3 +63,13 @@ parts:
             - usr/lib/
             - -usr/lib/gcc
             - -usr/share
+
+    dist-files:
+        plugin: dump
+        source: .
+        organize:
+            contrib/snap/monerod.conf: etc/monerod.conf
+    wrapper:
+        plugin: dump
+        source: contrib/snap/
+        stage: [monerod-wrapper]
diff --git a/contrib/snap/wallet.bash b/contrib/snap/wallet.bash
deleted file mode 100755
index 004f1371..00000000
--- a/contrib/snap/wallet.bash
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/bash -e
-
-export LD_LIBRARY_PATH=${SNAP_LIBRARY_PATH}:${SNAP}/usr/lib/x86_64-linux-gnu
-export HOME=${SNAP_USER_DATA}
-cd ${SNAP_USER_DATA}
-
-exec ${SNAP}/usr/bin/rlwrap ${SNAP}/bin/monero-wallet-cli "$@"