Merge pull request #11 from YunoHost-Apps/testing

Testing

README.md

@@ -3,21 +3,21 @@ N.B.: This README was automatically generated by https://github.com/YunoHost/app
 It shall NOT be edited by hand.
 -->
 
-# epicyon for YunoHost
+# Epicyon for YunoHost
 
 [![Integration level](https://dash.yunohost.org/integration/epicyon.svg)](https://dash.yunohost.org/appci/app/epicyon) ![](https://ci-apps.yunohost.org/ci/badges/epicyon.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/epicyon.maintain.svg)  
-[![Install epicyon with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=epicyon)
+[![Install Epicyon with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=epicyon)
 
 *[Lire ce readme en français.](./README_fr.md)*
 
-> *This package allows you to install epicyon quickly and simply on a YunoHost server.
+> *This package allows you to install Epicyon quickly and simply on a YunoHost server.
 If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/install) to learn how to install it.*
 
 ## Overview
 
 Federated social network server
 
-**Shipped version:** 1.03.2021~ynh2
+**Shipped version:** 23.10.2021~ynh1
 
 
 
@@ -28,7 +28,7 @@ Federated social network server
 ## Documentation and resources
 
 * Official app website: https://epicyon.net
-* Upstream app code repository: hhttps://gitlab.com/bashrc2/epicyon/
+* Upstream app code repository: https://gitlab.com/bashrc2/epicyon/
 * YunoHost documentation for this app: https://yunohost.org/app_epicyon
 * Report a bug: https://github.com/YunoHost-Apps/epicyon_ynh/issues
 

README_fr.md

@@ -1,19 +1,19 @@
-# epicyon pour YunoHost
+# Epicyon pour YunoHost
 
 [![Niveau d'intégration](https://dash.yunohost.org/integration/epicyon.svg)](https://dash.yunohost.org/appci/app/epicyon) ![](https://ci-apps.yunohost.org/ci/badges/epicyon.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/epicyon.maintain.svg)  
-[![Installer epicyon avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=epicyon)
+[![Installer Epicyon avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=epicyon)
 
 *[Read this readme in english.](./README.md)*
 *[Lire ce readme en français.](./README_fr.md)*
 
-> *Ce package vous permet d'installer epicyon rapidement et simplement sur un serveur YunoHost.
+> *Ce package vous permet d'installer Epicyon rapidement et simplement sur un serveur YunoHost.
 Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour savoir comment l'installer et en profiter.*
 
 ## Vue d'ensemble
 
 Serveur de réseau social fédéré
 
-**Version incluse :** 1.03.2021~ynh2
+**Version incluse :** 23.10.2021~ynh1
 
 
 
@@ -24,7 +24,7 @@ Serveur de réseau social fédéré
 ## Documentations et ressources
 
 * Site officiel de l'app : https://epicyon.net
-* Dépôt de code officiel de l'app : hhttps://gitlab.com/bashrc2/epicyon/
+* Dépôt de code officiel de l'app : https://gitlab.com/bashrc2/epicyon/
 * Documentation YunoHost pour cette app : https://yunohost.org/app_epicyon
 * Signaler un bug : https://github.com/YunoHost-Apps/epicyon_ynh/issues
 

conf/app.src

@@ -1,7 +1,6 @@
 SOURCE_URL=https://gitlab.com/bashrc2/epicyon/-/archive/18088169e682c05cba03349e01e759981396222f/epicyon-18088169e682c05cba03349e01e759981396222f.tar.gz
-SOURCE_SUM=9deaf12d50bc616150f404ed8c7412fb72b38d88cd1def6d8a39aa15f48f8ce3
+SOURCE_SUM=a560c52d49a22efd75a9c5006d695765f1a29ad70718fc50a0b26fcbcf640e0c
 SOURCE_SUM_PRG=sha256sum
 SOURCE_FORMAT=tar.gz
 SOURCE_IN_SUBDIR=true
-SOURCE_FILENAME=
 SOURCE_EXTRACT=true

manifest.json

@@ -1,17 +1,17 @@
 {
-    "name": "epicyon",
+    "name": "Epicyon",
     "id": "epicyon",
     "packaging_format": 1,
     "description": {
         "en": "Federated social network server",
         "fr": "Serveur de réseau social fédéré"
     },
-    "version": "1.03.2021~ynh2",
+    "version": "23.10.2021~ynh1",
     "url": "https://epicyon.net/",
     "upstream": {
         "license": "AGPL-1.0-or-later",
         "website": "https://epicyon.net",
-        "code": "hhttps://gitlab.com/bashrc2/epicyon/"
+        "code": "https://gitlab.com/bashrc2/epicyon/"
     },
     "license": "AGPL-1.0-or-later",
     "maintainer": {
@@ -28,18 +28,15 @@
         "install" : [
             {
                 "name": "domain",
-                "type": "domain",
+                "type": "domain"
-                "example": "example.com"
             },
             {
                 "name": "admin",
-                "type": "user",
+                "type": "user"
-                "example": "johndoe"
             },
             {
                 "name": "password",
-                "type": "password",
+                "type": "password"
-                "example": "Choose a password"
             }
         ]
     }

scripts/install

@@ -89,7 +89,7 @@ ynh_app_setting_set --app=$app --key=final_path --value=$final_path
 ynh_app_setting_set --app=$app --key=public_path --value=$public_path
 
 # Clone repo, create public path and link accounts
-git clone https://gitlab.com/bashrc2/epicyon $final_path
+git clone https://gitlab.com/bashrc2/epicyon $final_path --quiet
 
 mkdir $public_path
 mkdir -p $final_path/accounts/newsmirror

scripts/restore

@@ -38,8 +38,6 @@ public_path=$(ynh_app_setting_get --app=$app --key=public_path)
 #=================================================
 ynh_script_progression --message="Validating restoration parameters..." --weight=1
 
-ynh_webpath_available --domain=$domain --path_url=$path_url \
-	|| ynh_die --message="Path not available: ${domain}${path_url}"
 test ! -d $final_path \
 	|| ynh_die --message="There is already a directory: $final_path "
 

scripts/upgrade

@@ -69,7 +69,7 @@ then
 
 	# Pull the latest sorce
 	pushd "$final_path"
-		git pull
+		git pull --quiet
 	popd
 fi