From d122df886c45a5c498bf7eefcd3765d878de8700 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Mon, 23 Aug 2021 23:51:08 +0200 Subject: [PATCH 1/8] Fix --- scripts/install | 3 +-- scripts/upgrade | 1 - 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/scripts/install b/scripts/install index 35a6b12..2369a99 100755 --- a/scripts/install +++ b/scripts/install @@ -26,7 +26,7 @@ ynh_abort_if_errors domain=$YNH_APP_ARG_DOMAIN path_url="/" is_public=$YNH_APP_ARG_IS_PUBLIC -password=$YNH_APP_ARG_PASSWORD +password="$YNH_APP_ARG_PASSWORD" admin=$YNH_APP_ARG_ADMIN app=$YNH_APP_INSTANCE_NAME @@ -50,7 +50,6 @@ ynh_script_progression --message="Storing installation settings..." --weight=1 ynh_app_setting_set --app=$app --key=domain --value=$domain ynh_app_setting_set --app=$app --key=path --value=$path_url ynh_app_setting_set --app=$app --key=admin --value=$admin -ynh_app_setting_set --app=$app --key=password --value=$password #================================================= # STANDARD MODIFICATIONS diff --git a/scripts/upgrade b/scripts/upgrade index d3fef9d..882efb8 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -21,7 +21,6 @@ path_url=$(ynh_app_setting_get --app=$app --key=path) final_path=$(ynh_app_setting_get --app=$app --key=final_path) port=$(ynh_app_setting_get --app=$app --key=port) admin=$(ynh_app_setting_get --app=$app --key=admin) -password=$(ynh_app_setting_get --app=$app --key=password) #================================================= # CHECK VERSION From 3e0cdcacf0af1582d7cba40c2f68ed6ed7fe6bdb Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Mon, 23 Aug 2021 23:51:41 +0200 Subject: [PATCH 2/8] Update install --- scripts/install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/install b/scripts/install index 2369a99..4ef1342 100755 --- a/scripts/install +++ b/scripts/install @@ -26,7 +26,7 @@ ynh_abort_if_errors domain=$YNH_APP_ARG_DOMAIN path_url="/" is_public=$YNH_APP_ARG_IS_PUBLIC -password="$YNH_APP_ARG_PASSWORD" +password=$YNH_APP_ARG_PASSWORD admin=$YNH_APP_ARG_ADMIN app=$YNH_APP_INSTANCE_NAME From 6b5a1718aaeda771425eed5c57867015e3b00ba4 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Tue, 24 Aug 2021 07:43:17 +0200 Subject: [PATCH 3/8] fix --- scripts/install | 1 + scripts/upgrade | 1 + 2 files changed, 2 insertions(+) diff --git a/scripts/install b/scripts/install index 4ef1342..ac20a32 100755 --- a/scripts/install +++ b/scripts/install @@ -50,6 +50,7 @@ ynh_script_progression --message="Storing installation settings..." --weight=1 ynh_app_setting_set --app=$app --key=domain --value=$domain ynh_app_setting_set --app=$app --key=path --value=$path_url ynh_app_setting_set --app=$app --key=admin --value=$admin +ynh_app_setting_set --app=$app --key=admin --value="$password" #================================================= # STANDARD MODIFICATIONS diff --git a/scripts/upgrade b/scripts/upgrade index 882efb8..c30d647 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -21,6 +21,7 @@ path_url=$(ynh_app_setting_get --app=$app --key=path) final_path=$(ynh_app_setting_get --app=$app --key=final_path) port=$(ynh_app_setting_get --app=$app --key=port) admin=$(ynh_app_setting_get --app=$app --key=admin) +passwordn=$(ynh_app_setting_get --app=$app --key=password) #================================================= # CHECK VERSION From cbe889e50dff98ef79421b04822dee12383fe66e Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Tue, 24 Aug 2021 07:44:03 +0200 Subject: [PATCH 4/8] Update upgrade --- scripts/upgrade | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/upgrade b/scripts/upgrade index c30d647..d3fef9d 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -21,7 +21,7 @@ path_url=$(ynh_app_setting_get --app=$app --key=path) final_path=$(ynh_app_setting_get --app=$app --key=final_path) port=$(ynh_app_setting_get --app=$app --key=port) admin=$(ynh_app_setting_get --app=$app --key=admin) -passwordn=$(ynh_app_setting_get --app=$app --key=password) +password=$(ynh_app_setting_get --app=$app --key=password) #================================================= # CHECK VERSION From 43f2ad1e0370591fe7da9f39eee104a150171ba7 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Tue, 24 Aug 2021 09:27:31 +0200 Subject: [PATCH 5/8] Update install --- scripts/install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/install b/scripts/install index ac20a32..f68dd85 100755 --- a/scripts/install +++ b/scripts/install @@ -50,7 +50,7 @@ ynh_script_progression --message="Storing installation settings..." --weight=1 ynh_app_setting_set --app=$app --key=domain --value=$domain ynh_app_setting_set --app=$app --key=path --value=$path_url ynh_app_setting_set --app=$app --key=admin --value=$admin -ynh_app_setting_set --app=$app --key=admin --value="$password" +ynh_app_setting_set --app=$app --key=password --value="$password" #================================================= # STANDARD MODIFICATIONS From d8b8df5f813e0d1a7ec82ecb2d216108ca284ddd Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Tue, 24 Aug 2021 09:37:07 +0200 Subject: [PATCH 6/8] Update manifest.json --- manifest.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/manifest.json b/manifest.json index fb52154..c65e315 100644 --- a/manifest.json +++ b/manifest.json @@ -42,6 +42,10 @@ { "name": "password", "type": "password", + "help": { + "en": "Using some special characters such as % may cause issues.", + "fr": "L'utilisation de certains caractères spéciaux tels que % peut causer des erreurs." + }, "example": "Choose a password" }, { From e7c1ca8e691d3a7379c09f2867d9465cb03f6dd5 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Tue, 24 Aug 2021 09:37:53 +0200 Subject: [PATCH 7/8] Update manifest.json --- manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.json b/manifest.json index c65e315..b0a7b2d 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "A non-linear personal web notebook", "fr": "Un carnet Web personnel non linéaire" }, - "version": "5.1.23~ynh4", + "version": "5.1.23~ynh5", "url": "https://tiddlywiki.com/", "upstream": { "license": "BSD-2-Clause", From 30626027535718e89bfa36b947b78dc60a3563c6 Mon Sep 17 00:00:00 2001 From: Yunohost-Bot <> Date: Tue, 24 Aug 2021 07:37:57 +0000 Subject: [PATCH 8/8] 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 82c6a2c..aa0b355 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 A non-linear personal web notebook -**Shipped version:** 5.1.23~ynh4 +**Shipped version:** 5.1.23~ynh5 **Demo:** https://tiddlywiki.com/ diff --git a/README_fr.md b/README_fr.md index dd49f76..71e1dfe 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 Un carnet Web personnel non linéaire -**Version incluse :** 5.1.23~ynh4 +**Version incluse :** 5.1.23~ynh5 **Démo :** https://tiddlywiki.com/