From 09e65c0b31d9b576cf2683b3f107b094e240ffd3 Mon Sep 17 00:00:00 2001
From: oufmilo <44617467+oufmilo@users.noreply.github.com>
Date: Wed, 7 Feb 2024 20:21:56 +0100
Subject: [PATCH] Fix warning + description + admin

---
 doc/ADMIN.md          | 13 -------------
 doc/ADMIN_fr.md       | 13 -------------
 doc/DESCRIPTION.md    |  2 +-
 doc/DESCRIPTION_fr.md |  2 +-
 scripts/install       |  2 +-
 scripts/upgrade       |  4 ++--
 6 files changed, 5 insertions(+), 31 deletions(-)

diff --git a/doc/ADMIN.md b/doc/ADMIN.md
index faa1266..f2febaf 100644
--- a/doc/ADMIN.md
+++ b/doc/ADMIN.md
@@ -1,16 +1,3 @@
 ### Important points to read before installing
 
 - The first account created will be an admin user and will have all the admin rights.
-
-Using screen in case of disconnects
-
-``` 
-sudo apt-get install screen
-screen
-sudo yunohost app install https://github.com/YunoHost-Apps/misskey_ynh.git
-```
-Recover after disconnect:
-```
-screen -d
-screen -r
-```
diff --git a/doc/ADMIN_fr.md b/doc/ADMIN_fr.md
index 0a7af8b..4463911 100644
--- a/doc/ADMIN_fr.md
+++ b/doc/ADMIN_fr.md
@@ -1,16 +1,3 @@
 ### Points importants à lire avant l'installation
 
 - Le premier compte créé sera un utilisateur administrateur et disposera de tous les droits d'administrateur.
-
-Utiliser *screen* en cas de déconnexion
-
-``` 
-sudo apt-get install screen
-screen
-sudo yunohost app install https://github.com/YunoHost-Apps/misskey_ynh.git
-```
-Récupérer après déconnexion :
-```
-screen -d
-screen -r
-```
diff --git a/doc/DESCRIPTION.md b/doc/DESCRIPTION.md
index f1d9c76..c046f94 100644
--- a/doc/DESCRIPTION.md
+++ b/doc/DESCRIPTION.md
@@ -1 +1 @@
-Misskey is a decentralized microblogging platform. Since it exists within the Fediverse (a universe where various social media platforms are organized), it is mutually linked with other social media platforms.
+Sharkey is a decentralized microblogging platform. Since it exists within the Fediverse (a universe where various social media platforms are organized), it is mutually linked with other social media platforms.
diff --git a/doc/DESCRIPTION_fr.md b/doc/DESCRIPTION_fr.md
index e17cec6..d4c6f15 100644
--- a/doc/DESCRIPTION_fr.md
+++ b/doc/DESCRIPTION_fr.md
@@ -1 +1 @@
-Misskey est une plateforme de microblogging décentralisée. Puisqu'il existe au sein du Fediverse (un univers où diverses plateformes de médias sociaux sont organisées), il est mutuellement lié à d'autres plateformes de médias sociaux.
\ No newline at end of file
+Sharkey est une plateforme de microblogging décentralisée. Puisqu'il existe au sein du Fediverse (un univers où diverses plateformes de médias sociaux sont organisées), il est mutuellement lié à d'autres plateformes de médias sociaux.
\ No newline at end of file
diff --git a/scripts/install b/scripts/install
index 2ddd556..d690d90 100755
--- a/scripts/install
+++ b/scripts/install
@@ -24,7 +24,7 @@ ynh_script_progression --message="Setting up source files..." --weight=3
 mkdir -p "$install_dir"
 chown -R $app:www-data "$install_dir"
 
-ynh_exec_warn ynh_exec_as $app git clone --recurse-submodules -b stable https://activitypub.software/TransFem-org/Sharkey.git "$install_dir"
+ynh_exec_warn_less git clone --recurse-submodules -b stable https://activitypub.software/TransFem-org/Sharkey.git "$install_dir"
 
 chmod -R o-rwx "$install_dir"
 chown -R $app:www-data "$install_dir"
diff --git a/scripts/upgrade b/scripts/upgrade
index 05b3226..2432a3b 100755
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -60,8 +60,8 @@ ynh_add_nginx_config
 ynh_script_progression --message="Building app..."
 
 pushd "$install_dir"
-	git checkout stable
-	git pull --recurse-submodules
+	ynh_exec_warn_less git checkout stable
+	ynh_exec_warn_less git pull --recurse-submodules
     ynh_use_nodejs
     ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH pnpm cleanall
 	ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH pnpm install --frozen-lockfile