From 3d858c73aed25739c875c397a492a17d1fd3a6e5 Mon Sep 17 00:00:00 2001
From: Moul <moul@moul.re>
Date: Tue, 5 Apr 2022 18:36:10 +0200
Subject: [PATCH 1/3] [fix] #96: Add back ARM support

---
 conf/{app.src => amd64.src} | 0
 conf/armhf.src              | 7 +++++++
 scripts/install             | 5 +++--
 scripts/restore             | 5 +++--
 scripts/upgrade             | 5 +++--
 5 files changed, 16 insertions(+), 6 deletions(-)
 rename conf/{app.src => amd64.src} (100%)
 create mode 100644 conf/armhf.src

diff --git a/conf/app.src b/conf/amd64.src
similarity index 100%
rename from conf/app.src
rename to conf/amd64.src
diff --git a/conf/armhf.src b/conf/armhf.src
new file mode 100644
index 0000000..8a7c795
--- /dev/null
+++ b/conf/armhf.src
@@ -0,0 +1,7 @@
+SOURCE_URL=https://git.duniter.org/nodes/typescript/duniter/uploads/f272bf9239e8f97f15c01aafe53b6798/duniter-server-v1.8.0-linux-armv7l.deb
+SOURCE_SUM=5f769088aea5ee1feb3cb5bd58c4c36e2de897137646536bdcf511a6970990dc
+SOURCE_SUM_PRG=sha256sum
+SOURCE_FORMAT=deb
+SOURCE_IN_SUBDIR=true
+SOURCE_FILENAME=duniter-server-v1.8.0-linux-armv7l.deb
+SOURCE_EXTRACT=false
diff --git a/scripts/install b/scripts/install
index 51e4f0c..a27e12d 100755
--- a/scripts/install
+++ b/scripts/install
@@ -28,6 +28,7 @@ path_url="/"
 admin=$YNH_APP_ARG_ADMIN
 
 app=$YNH_APP_INSTANCE_NAME
+architecture=$YNH_ARCH
 
 #=================================================
 # CHECK IF THE APP CAN BE INSTALLED WITH THESE ARGS
@@ -80,8 +81,8 @@ ynh_script_progression --message="Building Duniter.. (this will take some time a
 
 tempdir="$(mktemp -d)"
 
-ynh_setup_source --dest_dir=$tempdir --source_id=app
-ynh_exec_warn_less dpkg -i $tempdir/duniter-server-v1.8.1-linux-x64.deb
+ynh_setup_source --dest_dir=$tempdir --source_id=$architecture
+ynh_exec_warn_less dpkg -i $tempdir/duniter-server-v1.8.*-linux-*.deb
 
 #=================================================
 # CREATE DATA DIRECTORY
diff --git a/scripts/restore b/scripts/restore
index f21b47e..08a140f 100644
--- a/scripts/restore
+++ b/scripts/restore
@@ -31,6 +31,7 @@ domain=$(ynh_app_setting_get --app=$app --key=domain)
 path_url=$(ynh_app_setting_get --app=$app --key=path)
 datadir=$(ynh_app_setting_get --app=$app --key=datadir)
 port=$(ynh_app_setting_get --app=$app --key=port)
+architecture=$YNH_ARCH
 
 #=================================================
 # STANDARD RESTORATION STEPS
@@ -71,8 +72,8 @@ ynh_script_progression --message="Building Duniter.. (this will take some time a
 
 tempdir="$(mktemp -d)"
 
-ynh_setup_source --dest_dir=$tempdir --source_id=app
-ynh_exec_warn_less dpkg -i $tempdir/duniter-server-v1.8.1-linux-x64.deb
+ynh_setup_source --dest_dir=$tempdir --source_id=$architecture
+ynh_exec_warn_less dpkg -i $tempdir/duniter-server-v1.8.*-linux-*.deb
 
 #=================================================
 # ADD A CONFIG FILE
diff --git a/scripts/upgrade b/scripts/upgrade
index 7517018..e12f122 100755
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -21,6 +21,7 @@ path_url=$(ynh_app_setting_get --app=$app --key=path)
 admin=$(ynh_app_setting_get --app=$app --key=admin)
 datadir=$(ynh_app_setting_get --app=$app --key=datadir)
 port=$(ynh_app_setting_get --app=$app --key=port)
+architecture=$YNH_ARCH
 
 #=================================================
 # CHECK VERSION
@@ -92,8 +93,8 @@ dpkg -r duniter
 
 tempdir="$(mktemp -d)"
 
-ynh_setup_source --dest_dir=$tempdir --source_id=app
-ynh_exec_warn_less dpkg -i $tempdir/duniter-server-v1.8.1-linux-x64.deb
+ynh_setup_source --dest_dir=$tempdir --source_id=$architecture
+ynh_exec_warn_less dpkg -i $tempdir/duniter-server-v1.8.*-linux-*.deb
 
 #=================================================
 # UPDATE A CONFIG FILE

From b1c4d787247151acdff35b92b4216f4d0a1c7220 Mon Sep 17 00:00:00 2001
From: yalh76 <yalh@yahoo.com>
Date: Wed, 6 Apr 2022 08:23:19 +0200
Subject: [PATCH 2/3] Update manifest.json

---
 manifest.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/manifest.json b/manifest.json
index f7e9dcb..4c2be83 100644
--- a/manifest.json
+++ b/manifest.json
@@ -6,7 +6,7 @@
         "en": "Crypto-currency software to operate Ğ1 libre currency",
         "fr": "Nœud qui permet de participer à l’écriture de blocs"
     },
-    "version": "1.8.1~ynh1",
+    "version": "1.8.1~ynh2",
     "url": "https://duniter.org",
     "license": "AGPL-3.0-or-later",
     "upstream": {

From e0c5d942360f3029f379db736181a62dbea1762c Mon Sep 17 00:00:00 2001
From: yunohost-bot <yunohost@yunohost.org>
Date: Wed, 6 Apr 2022 06:23:24 +0000
Subject: [PATCH 3/3] Auto-update README

---
 README.md    | 2 +-
 README_fr.md | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 131ca86..5b2b615 100644
--- a/README.md
+++ b/README.md
@@ -17,7 +17,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in
 
 Crypto-currency software to operate Ğ1 libre currency
 
-**Shipped version:** 1.8.1~ynh1
+**Shipped version:** 1.8.1~ynh2
 
 
 
diff --git a/README_fr.md b/README_fr.md
index 7463c77..d76161e 100644
--- a/README_fr.md
+++ b/README_fr.md
@@ -13,7 +13,7 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour
 
 Nœud qui permet de participer à l’écriture de blocs
 
-**Version incluse :** 1.8.1~ynh1
+**Version incluse :** 1.8.1~ynh2