From 8d68d01b15193ba4e9353b7cb27d8f8b233f3cb5 Mon Sep 17 00:00:00 2001
From: R4SAS <r4sas@users.noreply.github.com>
Date: Mon, 16 Jan 2023 23:55:41 +0000
Subject: [PATCH] [snap] update metadata (#9)

Make in buildable with snapcraft 4+
---
 README.md                          |   2 +-
 i2pd-logo.png => snap/gui/i2pd.png | Bin
 snap/local/i2pd-wrapper            |  19 +++++---
 snap/snapcraft.yaml                |  68 +++++++++++++++++------------
 4 files changed, 53 insertions(+), 36 deletions(-)
 rename i2pd-logo.png => snap/gui/i2pd.png (100%)

diff --git a/README.md b/README.md
index c0a1819..732288e 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,5 @@
 <h1 align="center">
-  <img src="i2pd-logo.png" alt="i2pd">
+  <img src="snap/gui/i2pd.png" alt="i2pd">
   <br />
   i2pd - Invisible Internet Protocol Daemon
 </h1>
diff --git a/i2pd-logo.png b/snap/gui/i2pd.png
similarity index 100%
rename from i2pd-logo.png
rename to snap/gui/i2pd.png
diff --git a/snap/local/i2pd-wrapper b/snap/local/i2pd-wrapper
index c226641..65cc87c 100755
--- a/snap/local/i2pd-wrapper
+++ b/snap/local/i2pd-wrapper
@@ -1,9 +1,14 @@
-#!/bin/sh
+#!/bin/env bash
 
-if [ ! -d "$SNAP_DATA/datadir" ]; then
-  mkdir $SNAP_DATA/datadir/
-  cp -R $SNAP/certificates $SNAP_DATA/datadir/
-  cp -R $SNAP/i2pd.conf $SNAP_DATA/datadir/
-fi
+if [ "$1" == 'reload' ]; then
+    exec "$SNAP/bin/kill" -1 $(cat $SNAP_DATA/datadir/i2pd.pid)
+elif [ "$1" == 'graceful' ]; then
+    exec "$SNAP/bin/kill" -2 $(cat $SNAP_DATA/datadir/i2pd.pid)
+else
+    if [ ! -d "$SNAP_DATA/datadir" ]; then
+        mkdir $SNAP_DATA/datadir
+        cp -R $SNAP/appdata/* $SNAP_DATA/datadir/
+    fi
 
-exec "$SNAP/bin/i2pd" --datadir=$SNAP_DATA/datadir/
+    exec "$SNAP/bin/i2pd" --datadir=$SNAP_DATA/datadir/
+fi
\ No newline at end of file
diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index 103aef9..d4a69c6 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -1,16 +1,19 @@
 name: i2pd
-version: 2.45.1
 summary: Distributed anonymous networking framework
 description: |
     i2pd (I2P Daemon) is a full-featured C++ implementation of I2P client.
     I2P (Invisible Internet Protocol) is a universal anonymous network layer.
     All communications over I2P are anonymous and end-to-end encrypted,
     participants don't reveal their real IP addresses.
+version: 2.45.1
 
-base: core18
+website: https://i2pd.website/
+source-code: https://github.com/PurpleI2P/i2pd-snap
+issues: https://github.com/PurpleI2P/i2pd/issues
+license: BSD-3-Clause
 
-icon: i2pd-logo.png
-type: app
+icon: snap/gui/i2pd.png
+base: core20
 grade: stable
 confinement: strict
 
@@ -18,38 +21,47 @@ apps:
   daemon:
     command: i2pd-wrapper
     daemon: simple
-    plugs: [network,network-bind]
+    plugs:
+    - network
+    - network-bind
+
   graceful-shutdown:
-    command: kill -2 `cat $SNAP_DATA/datadir/i2pd.pid`
+    command: i2pd-wrapper graceful
+
   reload-tunnels-conf:
-    command: kill -1 `cat $SNAP_DATA/datadir/i2pd.pid`
+    command: i2pd-wrapper reload
 
 parts:
   i2pd:
+    plugin: make
     source: https://github.com/PurpleI2P/i2pd.git
     source-type: git
-    source-tag: 2.45.1
-    plugin: make
-    make-parameters:
-      - USE_UPNP=yes
-      - DEBUG=no
+    #source-tag: 2.45.1
+    source-commit: 6ca6591c4365d62873eeac6328e5b1932862a614
     build-packages:
-      - build-essential
-      - libboost-date-time-dev
-      - libboost-filesystem-dev
-      - libboost-program-options-dev
-      - libboost-system-dev
-      - libminiupnpc-dev
-      - libssl-dev
-      - zlib1g-dev
-    artifacts:
-      - i2pd
-      - contrib/certificates
-      - contrib/i2pd.conf
-    organize:
-      i2pd: bin/
-      contrib/*: .
+    - build-essential
+    - libboost-date-time-dev
+    - libboost-filesystem-dev
+    - libboost-program-options-dev
+    - libboost-system-dev
+    - libminiupnpc-dev
+    - libssl-dev
+    - zlib1g-dev
+    override-build: |
+      make DEBUG=no USE_UPNP=yes -j`nproc`
+      mkdir $SNAPCRAFT_PART_INSTALL/appdata
+      cp i2pd $SNAPCRAFT_PART_INSTALL/bin
+      cp -r contrib/i2pd.conf contrib/tunnels.conf contrib/certificates $SNAPCRAFT_PART_INSTALL/appdata
+    stage-packages:
+    - libboost-date-time1.71.0
+    - libboost-filesystem1.71.0
+    - libboost-program-options1.71.0
+    - libboost-system1.71.0
+    - libminiupnpc17
+    - libssl1.1
+    - zlib1g
   wrapper:
     plugin: dump
     source: snap/local/
-    stage: [i2pd-wrapper]
+    stage:
+    - i2pd-wrapper