From 3e32fb100ce0634979074420e9d0646259045865 Mon Sep 17 00:00:00 2001
From: OniriCorpe <oniricorpe@disroot.org>
Date: Tue, 15 Mar 2022 22:47:43 +0100
Subject: [PATCH 01/14] attempt to detect armv6 and armv7

---
 scripts/_common.sh | 18 ++++++++++++++++++
 scripts/install    |  3 ++-
 scripts/upgrade    |  3 ++-
 3 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/scripts/_common.sh b/scripts/_common.sh
index c0220ac..55dc9b2 100644
--- a/scripts/_common.sh
+++ b/scripts/_common.sh
@@ -11,6 +11,24 @@ pkg_dependencies="postgresql postgresql-contrib"
 # PERSONAL HELPERS
 #=================================================
 
+ynh_detect_arch(){
+	local architecture
+	if [ -n "$(uname -m | grep arm64)" ] || [ -n "$(uname -m | grep aarch64)" ]; then
+		architecture="arm64"
+	elif [ -n "$(uname -m | grep 64)" ]; then
+		architecture="x86-64"
+	elif [ -n "$(uname -m | grep 86)" ]; then
+		architecture="i386"
+	elif [ -n "$(uname -m | grep armv6)" ]; then
+		architecture="armv6"
+	elif [ -n "$(uname -m | grep armv7)" ]; then
+		architecture="armv7"
+	else
+		architecture="unknown"
+	fi
+	echo $architecture
+}
+
 #=================================================
 # EXPERIMENTAL HELPERS
 #=================================================
diff --git a/scripts/install b/scripts/install
index d29a529..5c68f6d 100755
--- a/scripts/install
+++ b/scripts/install
@@ -140,7 +140,8 @@ ynh_script_progression --message="Setting up source files..." --weight=1
 ### downloaded from an upstream source, like a git repository.
 ### `ynh_setup_source` use the file conf/app.src
 
-architecture=$YNH_ARCH
+# ynh_detect_arch comes from _common.sh / personnal helpers
+architecture=$ynh_detect_arch
 
 # Download, check integrity, uncompress and patch the source from app.src
 ynh_setup_source --dest_dir="$final_path" --source_id=$architecture
diff --git a/scripts/upgrade b/scripts/upgrade
index 291f73f..6b06e3c 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -83,7 +83,8 @@ if [ "$upgrade_type" == "UPGRADE_APP" ]
 then
 	ynh_script_progression --message="Upgrading source files..."
 
-	architecture=$YNH_ARCH
+	# ynh_detect_arch comes from _common.sh / personnal helpers
+	architecture=$ynh_detect_arch
 
 	# Download, check integrity, uncompress and patch the source from app.src
 	ynh_setup_source --dest_dir="$final_path" --source_id=$architecture --keep="config.yaml"

From 6f37e451dc51c6b1e751a6b4a6ea8a1a40c0d080 Mon Sep 17 00:00:00 2001
From: OniriCorpe <oniricorpe@disroot.org>
Date: Tue, 15 Mar 2022 22:50:47 +0100
Subject: [PATCH 02/14] "ynh_" removed to avoid ambiguity

---
 scripts/_common.sh | 2 +-
 scripts/install    | 2 +-
 scripts/upgrade    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/scripts/_common.sh b/scripts/_common.sh
index 55dc9b2..b07e6c5 100644
--- a/scripts/_common.sh
+++ b/scripts/_common.sh
@@ -11,7 +11,7 @@ pkg_dependencies="postgresql postgresql-contrib"
 # PERSONAL HELPERS
 #=================================================
 
-ynh_detect_arch(){
+detect_arch(){
 	local architecture
 	if [ -n "$(uname -m | grep arm64)" ] || [ -n "$(uname -m | grep aarch64)" ]; then
 		architecture="arm64"
diff --git a/scripts/install b/scripts/install
index 5c68f6d..c50835a 100755
--- a/scripts/install
+++ b/scripts/install
@@ -141,7 +141,7 @@ ynh_script_progression --message="Setting up source files..." --weight=1
 ### `ynh_setup_source` use the file conf/app.src
 
 # ynh_detect_arch comes from _common.sh / personnal helpers
-architecture=$ynh_detect_arch
+architecture=$detect_arch
 
 # Download, check integrity, uncompress and patch the source from app.src
 ynh_setup_source --dest_dir="$final_path" --source_id=$architecture
diff --git a/scripts/upgrade b/scripts/upgrade
index 6b06e3c..c27ba86 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -84,7 +84,7 @@ then
 	ynh_script_progression --message="Upgrading source files..."
 
 	# ynh_detect_arch comes from _common.sh / personnal helpers
-	architecture=$ynh_detect_arch
+	architecture=$detect_arch
 
 	# Download, check integrity, uncompress and patch the source from app.src
 	ynh_setup_source --dest_dir="$final_path" --source_id=$architecture --keep="config.yaml"

From 3d0154a69fdbc2a56ac3bb9b74d72d283381e259 Mon Sep 17 00:00:00 2001
From: OniriCorpe <oniricorpe@disroot.org>
Date: Tue, 15 Mar 2022 22:51:56 +0100
Subject: [PATCH 03/14] comments updated

---
 scripts/install | 2 +-
 scripts/upgrade | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/install b/scripts/install
index c50835a..352edb2 100755
--- a/scripts/install
+++ b/scripts/install
@@ -140,7 +140,7 @@ ynh_script_progression --message="Setting up source files..." --weight=1
 ### downloaded from an upstream source, like a git repository.
 ### `ynh_setup_source` use the file conf/app.src
 
-# ynh_detect_arch comes from _common.sh / personnal helpers
+# detect_arch comes from _common.sh / personnal helpers
 architecture=$detect_arch
 
 # Download, check integrity, uncompress and patch the source from app.src
diff --git a/scripts/upgrade b/scripts/upgrade
index c27ba86..16f5de7 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -83,7 +83,7 @@ if [ "$upgrade_type" == "UPGRADE_APP" ]
 then
 	ynh_script_progression --message="Upgrading source files..."
 
-	# ynh_detect_arch comes from _common.sh / personnal helpers
+	# detect_arch comes from _common.sh / personnal helpers
 	architecture=$detect_arch
 
 	# Download, check integrity, uncompress and patch the source from app.src

From bbcdf840a5348ee7873e90a777d7e23991fbc343 Mon Sep 17 00:00:00 2001
From: OniriCorpe <oniricorpe@disroot.org>
Date: Tue, 15 Mar 2022 22:53:56 +0100
Subject: [PATCH 04/14] adding comments for detect_arch()

---
 scripts/_common.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/scripts/_common.sh b/scripts/_common.sh
index b07e6c5..d5c690b 100644
--- a/scripts/_common.sh
+++ b/scripts/_common.sh
@@ -11,6 +11,8 @@ pkg_dependencies="postgresql postgresql-contrib"
 # PERSONAL HELPERS
 #=================================================
 
+# custom function to detect armv6 and armv7
+# ($YNH_ARCH returns armhf for both...)
 detect_arch(){
 	local architecture
 	if [ -n "$(uname -m | grep arm64)" ] || [ -n "$(uname -m | grep aarch64)" ]; then

From 1c3ec78a2cc076bd11fdf5c4f22958406da33a20 Mon Sep 17 00:00:00 2001
From: emy <oniricorpe@disroot.org>
Date: Thu, 17 Mar 2022 05:57:19 +0100
Subject: [PATCH 05/14] added a warning about the non-availability of a user
 interface

---
 README.md            | 3 +++
 README_fr.md         | 3 +++
 doc/DISCLAIMER.md    | 3 +++
 doc/DISCLAIMER_fr.md | 3 +++
 4 files changed, 12 insertions(+)

diff --git a/README.md b/README.md
index 5054536..7d0f06d 100644
--- a/README.md
+++ b/README.md
@@ -39,6 +39,9 @@ GoToSocial require a dedicated root domain, for example: gotosocial.domain.tld.
 This package is not-working single-sign on or LDAP integration.  
 You will have a separate account from the rest of your Yunohost server, potentially with a different username and password.
 
+GoToSocial **does not provide a user interface**.  
+You will need to use a Mastodon-compatible client such as [https://tusky.app/](Tusky) on Android or an instance of [https://pinafore.social/](Pinafore) on the Web.
+
 You can login to [gts.superseriousbusiness.org/admin](https://gts.superseriousbusiness.org/admin/) to administrate your GoToSocial instance.
 The [source code of this administration panel](https://github.com/superseriousbusiness/gotosocial-admin) is available on github.
 
diff --git a/README_fr.md b/README_fr.md
index b42be2f..c6e7cd8 100644
--- a/README_fr.md
+++ b/README_fr.md
@@ -35,6 +35,9 @@ GoToSocial nécessite un nom de domaine dédié, par exemple : gotosocial.domain
 Ce paquet ne fonctionne pas avec l'authentification unique (SSO) ou l'intégration LDAP.  
 Vous aurez un compte séparé du reste de votre serveur Yunohost, avec potentiellement un nom d'utilisateur et un mot de passe différent.
 
+GoToSocial **ne dispose pas d'une interface utilisateur-ice**.  
+Vous devrez utiliser un client compatible avec Mastodon comme [https://tusky.app/](Tusky) sur Android ou une instance de [https://pinafore.social/](Pinafore) en Web.
+
 Vous pouvez vous connecter sur [gts.superseriousbusiness.org/admin](https://gts.superseriousbusiness.org/admin/) pour administrer votre insance GoToSocial.
 Le [code source de cette interface d'administration](https://github.com/superseriousbusiness/gotosocial-admin) est consultable sur github.
 
diff --git a/doc/DISCLAIMER.md b/doc/DISCLAIMER.md
index 16d87b8..69f864a 100644
--- a/doc/DISCLAIMER.md
+++ b/doc/DISCLAIMER.md
@@ -3,5 +3,8 @@ GoToSocial require a dedicated root domain, for example: gotosocial.domain.tld.
 This package is not-working single-sign on or LDAP integration.  
 You will have a separate account from the rest of your Yunohost server, potentially with a different username and password.
 
+GoToSocial **does not provide a user interface**.  
+You will need to use a Mastodon-compatible client such as [https://tusky.app/](Tusky) on Android or an instance of [https://pinafore.social/](Pinafore) on the Web.
+
 You can login to [gts.superseriousbusiness.org/admin](https://gts.superseriousbusiness.org/admin/) to administrate your GoToSocial instance.
 The [source code of this administration panel](https://github.com/superseriousbusiness/gotosocial-admin) is available on github.
diff --git a/doc/DISCLAIMER_fr.md b/doc/DISCLAIMER_fr.md
index 9f7de3f..85b53c8 100644
--- a/doc/DISCLAIMER_fr.md
+++ b/doc/DISCLAIMER_fr.md
@@ -3,5 +3,8 @@ GoToSocial nécessite un nom de domaine dédié, par exemple : gotosocial.domain
 Ce paquet ne fonctionne pas avec l'authentification unique (SSO) ou l'intégration LDAP.  
 Vous aurez un compte séparé du reste de votre serveur Yunohost, avec potentiellement un nom d'utilisateur et un mot de passe différent.
 
+GoToSocial **ne dispose pas d'une interface utilisateur-ice**.  
+Vous devrez utiliser un client compatible avec Mastodon comme [https://tusky.app/](Tusky) sur Android ou une instance de [https://pinafore.social/](Pinafore) en Web.
+
 Vous pouvez vous connecter sur [gts.superseriousbusiness.org/admin](https://gts.superseriousbusiness.org/admin/) pour administrer votre insance GoToSocial.
 Le [code source de cette interface d'administration](https://github.com/superseriousbusiness/gotosocial-admin) est consultable sur github.

From 539d7883b9fb5cadd570eef6a6f0c3374fa3a963 Mon Sep 17 00:00:00 2001
From: emy <oniricorpe@disroot.org>
Date: Thu, 17 Mar 2022 06:05:09 +0100
Subject: [PATCH 06/14] removed $ before function

---
 scripts/install | 2 +-
 scripts/upgrade | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/install b/scripts/install
index 352edb2..6f45c11 100755
--- a/scripts/install
+++ b/scripts/install
@@ -141,7 +141,7 @@ ynh_script_progression --message="Setting up source files..." --weight=1
 ### `ynh_setup_source` use the file conf/app.src
 
 # detect_arch comes from _common.sh / personnal helpers
-architecture=$detect_arch
+architecture=detect_arch
 
 # Download, check integrity, uncompress and patch the source from app.src
 ynh_setup_source --dest_dir="$final_path" --source_id=$architecture
diff --git a/scripts/upgrade b/scripts/upgrade
index 16f5de7..6985023 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -84,7 +84,7 @@ then
 	ynh_script_progression --message="Upgrading source files..."
 
 	# detect_arch comes from _common.sh / personnal helpers
-	architecture=$detect_arch
+	architecture=detect_arch
 
 	# Download, check integrity, uncompress and patch the source from app.src
 	ynh_setup_source --dest_dir="$final_path" --source_id=$architecture --keep="config.yaml"

From af8e95e0bee1dc6667f9a47be8ad6d74855ed677 Mon Sep 17 00:00:00 2001
From: emy <oniricorpe@disroot.org>
Date: Thu, 17 Mar 2022 06:18:30 +0100
Subject: [PATCH 07/14] ah no, that's the correct thing for functions

---
 scripts/install | 2 +-
 scripts/upgrade | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/scripts/install b/scripts/install
index 6f45c11..ecff842 100755
--- a/scripts/install
+++ b/scripts/install
@@ -141,7 +141,7 @@ ynh_script_progression --message="Setting up source files..." --weight=1
 ### `ynh_setup_source` use the file conf/app.src
 
 # detect_arch comes from _common.sh / personnal helpers
-architecture=detect_arch
+architecture=$(detect_arch)
 
 # Download, check integrity, uncompress and patch the source from app.src
 ynh_setup_source --dest_dir="$final_path" --source_id=$architecture
diff --git a/scripts/upgrade b/scripts/upgrade
index 6985023..3630a1b 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -84,8 +84,8 @@ then
 	ynh_script_progression --message="Upgrading source files..."
 
 	# detect_arch comes from _common.sh / personnal helpers
-	architecture=detect_arch
-
+	architecture=$(detect_arch)
+	
 	# Download, check integrity, uncompress and patch the source from app.src
 	ynh_setup_source --dest_dir="$final_path" --source_id=$architecture --keep="config.yaml"
 fi

From 610580c013cd4aec9ce59fc616f2ac4a922448b2 Mon Sep 17 00:00:00 2001
From: emy <oniricorpe@disroot.org>
Date: Thu, 17 Mar 2022 06:29:47 +0100
Subject: [PATCH 08/14] edit name according to the result of detect_arch
 function

---
 conf/{amd64.src => x86-64.src} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename conf/{amd64.src => x86-64.src} (100%)

diff --git a/conf/amd64.src b/conf/x86-64.src
similarity index 100%
rename from conf/amd64.src
rename to conf/x86-64.src

From 3fe27e86f438e1eaa96349a2885b467180a3deed Mon Sep 17 00:00:00 2001
From: emy <oniricorpe@disroot.org>
Date: Thu, 17 Mar 2022 06:36:07 +0100
Subject: [PATCH 09/14] renamed correctly

---
 conf/{armv6.src => armv6l.src} | 0
 conf/{armv7.src => armv7l.src} | 0
 2 files changed, 0 insertions(+), 0 deletions(-)
 rename conf/{armv6.src => armv6l.src} (100%)
 rename conf/{armv7.src => armv7l.src} (100%)

diff --git a/conf/armv6.src b/conf/armv6l.src
similarity index 100%
rename from conf/armv6.src
rename to conf/armv6l.src
diff --git a/conf/armv7.src b/conf/armv7l.src
similarity index 100%
rename from conf/armv7.src
rename to conf/armv7l.src

From e76e9f0f880c02f6b418a0cd46c9a38f41bd6cc3 Mon Sep 17 00:00:00 2001
From: OniriCorpe <oniricorpe@disroot.org>
Date: Thu, 17 Mar 2022 20:22:12 +0100
Subject: [PATCH 10/14] Revert "renamed correctly"

This reverts commit 3fe27e86f438e1eaa96349a2885b467180a3deed.
---
 conf/{armv6l.src => armv6.src} | 0
 conf/{armv7l.src => armv7.src} | 0
 2 files changed, 0 insertions(+), 0 deletions(-)
 rename conf/{armv6l.src => armv6.src} (100%)
 rename conf/{armv7l.src => armv7.src} (100%)

diff --git a/conf/armv6l.src b/conf/armv6.src
similarity index 100%
rename from conf/armv6l.src
rename to conf/armv6.src
diff --git a/conf/armv7l.src b/conf/armv7.src
similarity index 100%
rename from conf/armv7l.src
rename to conf/armv7.src

From 13a43235df207d398b3e628aba4fe5b7694fe062 Mon Sep 17 00:00:00 2001
From: OniriCorpe <oniricorpe@disroot.org>
Date: Fri, 18 Mar 2022 18:38:46 +0100
Subject: [PATCH 11/14] added alpha so maybe instable mention

---
 doc/DISCLAIMER.md    | 2 ++
 doc/DISCLAIMER_fr.md | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/doc/DISCLAIMER.md b/doc/DISCLAIMER.md
index 69f864a..fdc0ebc 100644
--- a/doc/DISCLAIMER.md
+++ b/doc/DISCLAIMER.md
@@ -1,3 +1,5 @@
+GoToSocial is still in alpha and **may be unstable**.
+
 GoToSocial require a dedicated root domain, for example: gotosocial.domain.tld.
 
 This package is not-working single-sign on or LDAP integration.  
diff --git a/doc/DISCLAIMER_fr.md b/doc/DISCLAIMER_fr.md
index 85b53c8..3c1ec2c 100644
--- a/doc/DISCLAIMER_fr.md
+++ b/doc/DISCLAIMER_fr.md
@@ -1,3 +1,5 @@
+GoToSocial est encore en alpha et **peut etre instable**.
+
 GoToSocial nécessite un nom de domaine dédié, par exemple : gotosocial.domain.tld.
 
 Ce paquet ne fonctionne pas avec l'authentification unique (SSO) ou l'intégration LDAP.  

From 0c50530f5a2665651e0f88a1ddae9c8256659b36 Mon Sep 17 00:00:00 2001
From: OniriCorpe <oniricorpe@disroot.org>
Date: Fri, 18 Mar 2022 18:43:19 +0100
Subject: [PATCH 12/14] fix protocol config

---
 conf/config.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/conf/config.yaml b/conf/config.yaml
index 8de7d54..d3eccd7 100644
--- a/conf/config.yaml
+++ b/conf/config.yaml
@@ -53,7 +53,7 @@ account-domain: ""
 # letsencrypt, it should still be https.
 # Options: ["http","https"]
 # Default: "https"
-protocol: "http"
+protocol: "https"
 
 # String. Address to bind the GoToSocial server to.
 # This can be an IPv4 address or an IPv6 address (surrounded in square brackets), or a hostname.

From ca1654d3e9efbaef44f9d12a70141b7da80a3ea1 Mon Sep 17 00:00:00 2001
From: OniriCorpe <oniricorpe@disroot.org>
Date: Fri, 18 Mar 2022 18:44:12 +0100
Subject: [PATCH 13/14] 0.2.1~ynh2 to 0.2.1~ynh3

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

diff --git a/manifest.json b/manifest.json
index 77280bf..098c1f7 100644
--- a/manifest.json
+++ b/manifest.json
@@ -6,7 +6,7 @@
         "en": "An ActivityPub social network server, written in Golang.",
         "fr": "Un serveur de réseau social basé sur ActivityPub écrit en Golang."
     },
-    "version": "0.2.1~ynh2",
+    "version": "0.2.1~ynh3",
     "url": "https://github.com/superseriousbusiness/gotosocial",
     "upstream": {
         "license": " AGPL-3.0-only",

From 460048e78df8a195b1eca5994a4699079954b312 Mon Sep 17 00:00:00 2001
From: OniriCorpe <oniricorpe@disroot.org>
Date: Fri, 18 Mar 2022 18:44:18 +0100
Subject: [PATCH 14/14] update readmes

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

diff --git a/README.md b/README.md
index 7d0f06d..3ab4768 100644
--- a/README.md
+++ b/README.md
@@ -24,7 +24,7 @@ With GoToSocial, you can keep in touch with your friends, post, read, and share
 Documentation is at [docs.gotosocial.org](https://docs.gotosocial.org).
 
 
-**Shipped version:** 0.2.1~ynh2
+**Shipped version:** 0.2.1~ynh3
 
 
 
@@ -34,6 +34,8 @@ Documentation is at [docs.gotosocial.org](https://docs.gotosocial.org).
 
 ## Disclaimers / important information
 
+GoToSocial is still in alpha and **may be unstable**.
+
 GoToSocial require a dedicated root domain, for example: gotosocial.domain.tld.
 
 This package is not-working single-sign on or LDAP integration.  
diff --git a/README_fr.md b/README_fr.md
index c6e7cd8..813040e 100644
--- a/README_fr.md
+++ b/README_fr.md
@@ -20,7 +20,7 @@ Avec GoToSocial, vous pouvez rester en contact avec vos amis, publier, lire et p
 Vous pouvez consulter la documentation à l'adresse : [docs.gotosocial.org](https://docs.gotosocial.org).
 
 
-**Version incluse :** 0.2.1~ynh2
+**Version incluse :** 0.2.1~ynh3
 
 
 
@@ -30,6 +30,8 @@ Vous pouvez consulter la documentation à l'adresse : [docs.gotosocial.org](http
 
 ## Avertissements / informations importantes
 
+GoToSocial est encore en alpha et **peut etre instable**.
+
 GoToSocial nécessite un nom de domaine dédié, par exemple : gotosocial.domain.tld.
 
 Ce paquet ne fonctionne pas avec l'authentification unique (SSO) ou l'intégration LDAP.