Merge pull request #14 from YunoHost-Apps/testing

README.md

@@ -20,7 +20,7 @@ Iceshrimp is a decentralized and federated social networking service, implementi
 
 It was forked from Calckey Firefish (itself a fork of Misskey) in mid-2023, to focus on stability, performance and usability instead of new features.
 
-**Shipped version:** 2023.12.6~ynh1
+**Shipped version:** 2023.12.7~ynh1
 
 ## Screenshots
 

README_es.md

@@ -20,7 +20,7 @@ Iceshrimp is a decentralized and federated social networking service, implementi
 
 It was forked from Calckey Firefish (itself a fork of Misskey) in mid-2023, to focus on stability, performance and usability instead of new features.
 
-**Versión actual:** 2023.12.6~ynh1
+**Versión actual:** 2023.12.7~ynh1
 
 ## Capturas
 

README_eu.md

@@ -20,7 +20,7 @@ Iceshrimp is a decentralized and federated social networking service, implementi
 
 It was forked from Calckey Firefish (itself a fork of Misskey) in mid-2023, to focus on stability, performance and usability instead of new features.
 
-**Paketatutako bertsioa:** 2023.12.6~ynh1
+**Paketatutako bertsioa:** 2023.12.7~ynh1
 
 ## Pantaila-argazkiak
 

README_fr.md

@@ -20,7 +20,7 @@ Iceshrimp est un service de réseau social décentralisé et fédéré, impléme
 
 Il a été forké de Calckey et Firefish (lui-même forké de Misskey) à la mi-2023, afin de se concentrer sur la stabilité, les performances et la facilité d'utilisation plutôt que sur de nouvelles fonctionnalités.
 
-**Version incluse :** 2023.12.6~ynh1
+**Version incluse :** 2023.12.7~ynh1
 
 ## Captures d’écran
 

README_gl.md

@@ -20,7 +20,7 @@ Iceshrimp is a decentralized and federated social networking service, implementi
 
 It was forked from Calckey Firefish (itself a fork of Misskey) in mid-2023, to focus on stability, performance and usability instead of new features.
 
-**Versión proporcionada:** 2023.12.6~ynh1
+**Versión proporcionada:** 2023.12.7~ynh1
 
 ## Capturas de pantalla
 

README_it.md

@@ -1,48 +0,0 @@
-<!--
-N.B.: Questo README è stato automaticamente generato da <https://github.com/YunoHost/apps/tree/master/tools/readme_generator>
-NON DEVE essere modificato manualmente.
--->
-
-# Iceshrimp per YunoHost
-
-[![Livello di integrazione](https://dash.yunohost.org/integration/iceshrimp.svg)](https://dash.yunohost.org/appci/app/iceshrimp) ![Stato di funzionamento](https://ci-apps.yunohost.org/ci/badges/iceshrimp.status.svg) ![Stato di manutenzione](https://ci-apps.yunohost.org/ci/badges/iceshrimp.maintain.svg)
-
-[![Installa Iceshrimp con YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=iceshrimp)
-
-*[Leggi questo README in altre lingue.](./ALL_README.md)*
-
-> *Questo pacchetto ti permette di installare Iceshrimp su un server YunoHost in modo semplice e veloce.*  
-> *Se non hai YunoHost, consulta [la guida](https://yunohost.org/install) per imparare a installarlo.*
-
-## Panoramica
-
-Iceshrimp is a decentralized and federated social networking service, implementing the ActivityPub standard.
-
-It was forked from Calckey Firefish (itself a fork of Misskey) in mid-2023, to focus on stability, performance and usability instead of new features.
-
-**Versione pubblicata:** 2023.12.5~ynh1
-
-## Screenshot
-
-![Screenshot di Iceshrimp](./doc/screenshots/example.jpg)
-
-## Documentazione e risorse
-
-- Sito web ufficiale dell’app: <https://iceshrimp.dev>
-- Repository upstream del codice dell’app: <https://iceshrimp.dev/iceshrimp/iceshrimp>
-- Store di YunoHost: <https://apps.yunohost.org/app/iceshrimp>
-- Segnala un problema: <https://github.com/YunoHost-Apps/iceshrimp_ynh/issues>
-
-## Informazioni per sviluppatori
-
-Si prega di inviare la tua pull request alla [branch di `testing`](https://github.com/YunoHost-Apps/iceshrimp_ynh/tree/testing).
-
-Per provare la branch di `testing`, si prega di procedere in questo modo:
-
-```bash
-sudo yunohost app install https://github.com/YunoHost-Apps/iceshrimp_ynh/tree/testing --debug
-o
-sudo yunohost app upgrade iceshrimp -u https://github.com/YunoHost-Apps/iceshrimp_ynh/tree/testing --debug
-```
-
-**Maggiori informazioni riguardo il pacchetto di quest’app:** <https://yunohost.org/packaging_apps>

README_zh_Hans.md

@@ -20,7 +20,7 @@ Iceshrimp is a decentralized and federated social networking service, implementi
 
 It was forked from Calckey Firefish (itself a fork of Misskey) in mid-2023, to focus on stability, performance and usability instead of new features.
 
-**分发版本：** 2023.12.6~ynh1
+**分发版本：** 2023.12.7~ynh1
 
 ## 截图
 

manifest.toml

@@ -5,7 +5,7 @@ name = "Iceshrimp"
 description.en = "Decentralized and federated social networking service"
 description.fr = "Service de réseau social décentralisé et fédéré"
 
-version = "2023.12.6~ynh1"
+version = "2023.12.7~ynh1"
 
 maintainers = ["oufmilo"]
 

scripts/upgrade

@@ -63,9 +63,8 @@ then
 
 	pushd $install_dir
 		chown -R $app:www-data "$install_dir"
-		
+		ynh_exec_warn_less ynh_exec_as $app git config --global --add safe.directory "$install_dir"
 		ynh_exec_warn_less ynh_exec_as $app git fetch
-    	#git checkout master
     	ynh_exec_warn_less ynh_exec_as $app git pull
 	popd
 fi

tests.toml

@@ -15,5 +15,3 @@ test_format = 1.0
     # -------------------------------
     # Commits to test upgrade from
     # -------------------------------
-
-