From b5bae51155acdac2542a62993f287a9393a9b801 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Thu, 23 Sep 2021 23:27:35 +0200 Subject: [PATCH 1/5] Fix typos --- manifest.json | 13 +++++-------- scripts/restore | 2 -- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/manifest.json b/manifest.json index 902943a..97c86e6 100644 --- a/manifest.json +++ b/manifest.json @@ -1,5 +1,5 @@ { - "name": "epicyon", + "name": "Epicyon", "id": "epicyon", "packaging_format": 1, "description": { @@ -11,7 +11,7 @@ "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", - "example": "example.com" + "type": "domain" }, { "name": "admin", - "type": "user", - "example": "johndoe" + "type": "user" }, { "name": "password", - "type": "password", - "example": "Choose a password" + "type": "password" } ] } diff --git a/scripts/restore b/scripts/restore index 89a5f5e..6bf2c97 100755 --- a/scripts/restore +++ b/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 " From 2e61cd0ffbdd0d88533662296faa4b85ea3166d0 Mon Sep 17 00:00:00 2001 From: Yunohost-Bot <> Date: Thu, 23 Sep 2021 21:27:40 +0000 Subject: [PATCH 2/5] Auto-update README --- README.md | 8 ++++---- README_fr.md | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index a0ac869..ae68772 100644 --- a/README.md +++ b/README.md @@ -3,14 +3,14 @@ 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 @@ -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 diff --git a/README_fr.md b/README_fr.md index 4b55446..af0f973 100644 --- a/README_fr.md +++ b/README_fr.md @@ -1,12 +1,12 @@ -# 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 @@ -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 From 0586bf514ed20e3b2fa5133355c29c4e2b77c000 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Thu, 23 Sep 2021 23:29:31 +0200 Subject: [PATCH 3/5] fix --- scripts/install | 2 +- scripts/upgrade | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/install b/scripts/install index 77c62cd..5ee48eb 100755 --- a/scripts/install +++ b/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 diff --git a/scripts/upgrade b/scripts/upgrade index d5b7df8..e42ccb2 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -69,7 +69,7 @@ then # Pull the latest sorce pushd "$final_path" - git pull + git pull --quiet popd fi From b957f9cb19f30ee504d49c8a0f3b64bdad0ecdc9 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Thu, 23 Sep 2021 23:32:45 +0200 Subject: [PATCH 4/5] Update --- conf/app.src | 3 +-- manifest.json | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/conf/app.src b/conf/app.src index 8648f7b..763ab76 100644 --- a/conf/app.src +++ b/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 diff --git a/manifest.json b/manifest.json index 97c86e6..8875283 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "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", From de5364cdaa131576ef4e8cd8397bb4642386db02 Mon Sep 17 00:00:00 2001 From: Yunohost-Bot <> Date: Thu, 23 Sep 2021 21:32:51 +0000 Subject: [PATCH 5/5] Auto-update README --- README.md | 2 +- README_fr.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index ae68772..1a90f35 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in Federated social network server -**Shipped version:** 1.03.2021~ynh2 +**Shipped version:** 23.10.2021~ynh1 diff --git a/README_fr.md b/README_fr.md index af0f973..681e051 100644 --- a/README_fr.md +++ b/README_fr.md @@ -13,7 +13,7 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour Serveur de réseau social fédéré -**Version incluse :** 1.03.2021~ynh2 +**Version incluse :** 23.10.2021~ynh1