Merge pull request #1789

5db8df7b Unify dist files and prime (vdo)
38b9226f wrapper +x (vdo)
b4c90d56 Add meta icon for snap (vdo)
a2b90426 Add snap symlink (vdo)
2c51c4d1 Reorganize snap. Add daemon wrapper (vdo)
This commit is contained in:
Riccardo Spagni 2017-02-24 12:02:45 +02:00
commit 45c98e948b
No known key found for this signature in database
GPG key ID: 55432DF31CCD4FCD
8 changed files with 32 additions and 26 deletions

View file

@ -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

View file

@ -1,3 +0,0 @@
#!/bin/bash -e
exec tail -c +0 -F ${SNAP_DATA}/.bitmonero/bitmonero.log

8
contrib/snap/monerod-wrapper Executable file
View file

@ -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" "$@"

View file

@ -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

Binary file not shown.

After

Width:  |  Height:  |  Size: 19 KiB

View file

@ -1,5 +1,5 @@
name: monero name: monero
version: 0.10.1 # Current stable version version: 0.10.2-1
summary: "Monero: the secure, private, untraceable cryptocurrency https://getmonero.org" summary: "Monero: the secure, private, untraceable cryptocurrency https://getmonero.org"
description: | description: |
Monero is a private, secure, untraceable, decentralised digital currency. Monero is a private, secure, untraceable, decentralised digital currency.
@ -12,7 +12,7 @@ apps:
monerod: monerod:
daemon: forking daemon: forking
command: | command: |
monerod --detach --data-dir ${SNAP_DATA} monerod-wrapper --detach --data-dir ${SNAP_COMMON} --config-file ${SNAP_USER_DATA}/etc/monerod.conf
plugs: plugs:
- network - network
- network-bind - network-bind
@ -63,3 +63,13 @@ parts:
- usr/lib/ - usr/lib/
- -usr/lib/gcc - -usr/lib/gcc
- -usr/share - -usr/share
dist-files:
plugin: dump
source: .
organize:
contrib/snap/monerod.conf: etc/monerod.conf
contrib/snap/monerod-wrapper: bin/monerod-wrapper
prime:
- etc
- bin

View file

@ -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 "$@"

1
snap Symbolic link
View file

@ -0,0 +1 @@
contrib/snap