Merge branch 'testing' into v0.16.0-preparation

doc/PRE_INSTALL.md

@@ -6,6 +6,6 @@ Please note the following points:
 - If you uninstall GoToSocial, you will no longer be able to use this domain name with another federated software installation, as it will be impossible to reuse the keys used to secure the federation.
 - GoToSocial **does not provide a user interface**.
 
-You will need to use a Mastodon-compatible client such as [Tusky](https://tusky.app/) on Android, [Feditext](https://fedi.software/@Feditext) for iOS or an instance of [Semaphore](https://semaphore.social/) on the Web.
+You will need to use a Mastodon-compatible client such as [Tusky](https://tusky.app/) on Android, [Feditext](https://github.com/feditext/feditext/blob/develop/README.md) for iOS or an instance of [Semaphore](https://semaphore.social/) on the Web.
 
 Also this package uses the ["i'm so tired" software license 1.0](https://github.com/YunoHost-Apps/gotosocial_ynh/blob/master/LICENSE), please read it and accept it before proceeding with installation.

doc/PRE_INSTALL_fr.md

@@ -6,6 +6,6 @@ Veuillez noter les points suivant :
 - Vous ne pourrez plus utiliser ce nom de domaine avec une autre installation d'un logiciel de fédivers si vous désinstallez GoToSocial, en raison de l'impossibilité de réutiliser les clés servant à sécuriser la fédération.
 - GoToSocial **ne dispose pas d'une interface utilisateur-ice**.  
 
-Vous devrez utiliser un client compatible avec Mastodon comme [Tusky](https://tusky.app/) sur Android, [Feditext](https://fedi.software/@Feditext) sur iOS ou une instance de [Semaphore](https://semaphore.social/) en Web.
+Vous devrez utiliser un client compatible avec Mastodon comme [Tusky](https://tusky.app/) sur Android, [Feditext](https://github.com/feditext/feditext/blob/develop/README.md) sur iOS ou une instance de [Semaphore](https://semaphore.social/) en Web.
 
 Aussi, ce paquet utilise la ["i'm so tired" software license 1.0](https://github.com/YunoHost-Apps/gotosocial_ynh/blob/master/LICENSE), veuillez la lire et l'accepter avant de procéder à l'installation.

doc/PRE_UPGRADE_fr.md

@@ -0,0 +1,2 @@
+GoToSocial prend un certain temps (de quelques secondes à plusieurs minutes) après chaque mise à jour afin de réaliser diverses choses, telles que les migrations ou des mises à jour dans la base de donnée.  
+Si votre instance est innaccessible, s'il vous plaît, faites preuve de patience et **ne le redémarrez pas** au risque de tout casser !

manifest.toml

@@ -93,17 +93,14 @@ i386.url = "https://github.com/superseriousbusiness/gotosocial/releases/download
 i386.sha256 = "7755365763749148e6278ec728aa9cb0827537735ca142165ffda901118354b2"
 amd64.url = "https://github.com/superseriousbusiness/gotosocial/releases/download/v0.16.0-rc3/gotosocial_0.16.0-rc3_linux_amd64.tar.gz"
 amd64.sha256 = "49ebdf55af3aaaf8eb48a5d877a75acdf9f46154cdf960e39805c564a9f91b1c"
-armv6.url = "https://github.com/superseriousbusiness/gotosocial/releases/download/v0.16.0-rc3/gotosocial_0.16.0-rc3_linux_armv6.tar.gz"
-armv6.sha256 = "c14b669906000611a9b898881bb55ec4d301ebbd96a3a051607828706fa3f1cd"
-armv7.url = "https://github.com/superseriousbusiness/gotosocial/releases/download/v0.16.0-rc3/gotosocial_0.16.0-rc3_linux_armv7.tar.gz"
-armv7.sha256 = "24d631f2dc46dc73617d0c8db0cb4754d6cb8068112fa35ced2804e57069b1c0"
+armhf.url = "https://github.com/superseriousbusiness/gotosocial/releases/download/v0.16.0-rc3/gotosocial_0.16.0-rc3_linux_armv7.tar.gz"
+armhf.sha256 = "24d631f2dc46dc73617d0c8db0cb4754d6cb8068112fa35ced2804e57069b1c0"
 arm64.url = "https://github.com/superseriousbusiness/gotosocial/releases/download/v0.16.0-rc3/gotosocial_0.16.0-rc3_linux_arm64.tar.gz"
 arm64.sha256 = "3a56ddb9babb6726e0980dec21b85859442b8247822e4388d3249c833aa3a830"
 
 autoupdate.asset.i386 = "gotosocial_.*linux_386.tar.gz$"
 autoupdate.asset.amd64 = "gotosocial_.*linux_amd64.tar.gz$"
-autoupdate.asset.armv6 = "gotosocial_.*linux_armv6.tar.gz$"
-autoupdate.asset.armv7 = "gotosocial_.*linux_armv7.tar.gz$"
+autoupdate.asset.armhf = "gotosocial_.*linux_armv7.tar.gz$"
 autoupdate.asset.arm64 = "gotosocial_.*linux_arm64.tar.gz$"
 autoupdate.strategy = "latest_github_release"
 

scripts/_common.sh

@@ -8,26 +8,6 @@
 # PERSONAL HELPERS
 #=================================================
 
-# custom function to detect armv6 and armv7
-# ($YNH_ARCH returns armhf for both...)
-detect_arch(){
-	local architecture
-	if uname -m | grep -q -E "arm64|aarch64" ; then
-		architecture="arm64"
-	elif uname -m | grep -q "64" ; then
-		architecture="amd64"
-	elif uname -m | grep -q "86" ; then
-		architecture="i386"
-	elif uname -m | grep -q "armv6" ; then
-		architecture="armv6"
-	elif uname -m | grep -q "armv7" ; then
-		architecture="armv7"
-	else
-		ynh_die --message="The script can't identify a valid architecture. Please report this error."
-	fi
-	echo $architecture
-}
-
 # custom function to change bash bool 0/1 to false/true
 convert_bool(){
 	(("$1")) && echo "true" || echo "false"

scripts/install

@@ -155,9 +155,6 @@ 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
 
-# detect_arch comes from _common.sh / personnal helpers
-architecture=$(detect_arch)
-
 # Download, check integrity, uncompress and patch the source from app.src
 ynh_setup_source --dest_dir="$install_dir" 
 

scripts/upgrade

@@ -294,9 +294,6 @@ fi
 if [ "$upgrade_type" == "UPGRADE_APP" ]
 then
 	ynh_script_progression --message="Upgrading source files..."
-
-	# detect_arch comes from _common.sh / personnal helpers
-	architecture=$(detect_arch)
 	
 	# Download, check integrity, uncompress and patch the source from app.src
 	ynh_setup_source --dest_dir="$install_dir" --full_replace=1 --keep="config.yaml"