From 472b80cf4ca3e5c699feffd3323bd8eeaf96c25a Mon Sep 17 00:00:00 2001 From: Yunohost-Bot <> Date: Sat, 29 May 2021 09:24:41 +0000 Subject: [PATCH 01/16] Auto-update README --- README.md | 53 ++++++++++++++++++++++++---------------------------- README_fr.md | 51 +++++++++++++++++++++----------------------------- 2 files changed, 45 insertions(+), 59 deletions(-) diff --git a/README.md b/README.md index 840720f..d43b0a8 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,8 @@ + + # TiddlyWiki for YunoHost [![Integration level](https://dash.yunohost.org/integration/tiddlywiki.svg)](https://dash.yunohost.org/appci/app/tiddlywiki) ![](https://ci-apps.yunohost.org/ci/badges/tiddlywiki.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/tiddlywiki.maintain.svg) @@ -5,45 +10,33 @@ *[Lire ce readme en français.](./README_fr.md)* -> *This package allow you to install TiddlyWiki quickly and simply on a YunoHost server. -If you don’t have YunoHost, please see [here](https://yunohost.org/install) to know how to install and enjoy it.* +> *This package allows you to install TiddlyWiki 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 -TiddlyWiki is a non-linear personal web notebook that anyone can use and keep forever, independently of any corporation. -TiddlyWiki is a complete interactive wiki in JavaScript. It can be used as a single HTML file in the browser or as a powerful Node.js application. It is highly customisable: the entire user interface is itself implemented in hackable WikiText. -**Shipped version:** 5.1.23 +A non-linear personal web notebook + +**Shipped version:** 5.1.23~ynh3 + +**Demo:** https://tiddlywiki.com/ ## Screenshots -![](screenshot.png) +![](./doc/screenshots/.DS_Store) +![](./doc/screenshots/screenshot.png) -## Demo +## Documentation and resources -* [Official demo](https://tiddlywiki.com/) +* Official app website: https://tiddlywiki.com/ +* Official admin documentation: https://tiddlywiki.com/ +* Upstream app code repository: https://github.com/Jermolene/TiddlyWiki5 +* YunoHost documentation for this app: https://yunohost.org/app_tiddlywiki +* Report a bug: https://github.com/YunoHost-Apps/tiddlywiki_ynh/issues -## Documentation +## Developer info - * Official documentation: Link to the official documentation of this app - * YunoHost documentation: If specific documentation is needed, feel free to contribute. - -#### Supported architectures - -* x86-64 - [![Build Status](https://ci-apps.yunohost.org/ci/logs/tiddlywiki.svg)](https://ci-apps.yunohost.org/ci/apps/tiddlywiki/) -* ARMv8-A - [![Build Status](https://ci-apps-arm.yunohost.org/ci/logs/tiddlywiki.svg)](https://ci-apps-arm.yunohost.org/ci/apps/tiddlywiki/) - -## Links - - * Report a bug: https://github.com/YunoHost-Apps/tiddlywiki_ynh/issues - * App website: https://tiddlywiki.com/ - * Upstream app repository: https://github.com/Jermolene/TiddlyWiki5 - * YunoHost website: https://yunohost.org/ - ---- - -## Developers info - -Please do your pull request to the [testing branch](https://github.com/YunoHost-Apps/tiddlywiki_ynh/tree/testing). +Please send your pull request to the [testing branch](https://github.com/YunoHost-Apps/tiddlywiki_ynh/tree/testing). To try the testing branch, please proceed like that. ``` @@ -51,3 +44,5 @@ sudo yunohost app install https://github.com/YunoHost-Apps/tiddlywiki_ynh/tree/t or sudo yunohost app upgrade tiddlywiki -u https://github.com/YunoHost-Apps/tiddlywiki_ynh/tree/testing --debug ``` + +**More info regarding app packaging:** https://yunohost.org/packaging_apps \ No newline at end of file diff --git a/README_fr.md b/README_fr.md index e44354d..51d6fe4 100644 --- a/README_fr.md +++ b/README_fr.md @@ -1,45 +1,34 @@ # TiddlyWiki pour YunoHost -[![Integration level](https://dash.yunohost.org/integration/tiddlywiki.svg)](https://dash.yunohost.org/appci/app/tiddlywiki) ![](https://ci-apps.yunohost.org/ci/badges/tiddlywiki.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/tiddlywiki.maintain.svg) +[![Niveau d'intégration](https://dash.yunohost.org/integration/tiddlywiki.svg)](https://dash.yunohost.org/appci/app/tiddlywiki) ![](https://ci-apps.yunohost.org/ci/badges/tiddlywiki.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/tiddlywiki.maintain.svg) [![Installer TiddlyWiki avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=tiddlywiki) -*[Read this readme in english.](./README.md)* +*[Read this readme in english.](./README.md)* +*[Lire ce readme en français.](./README_fr.md)* -> *Ce package vous permet d’installer TiddlyWiki 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.* +> *This package allows you to install TiddlyWiki 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.* -## Vue d’ensemble -TiddlyWiki est un cahier Web personnel non linéaire que tout le monde peut utiliser et conserver pour toujours, indépendamment de toute entreprise. -TiddlyWiki est un wiki interactif complet en JavaScript. Il peut être utilisé comme un seul fichier HTML dans le navigateur ou comme une puissante application Node.js. +## Vue d'ensemble -**Shipped version:** 5.1.23 +Un carnet Web personnel non linéaire -## Captures d’écran +**Version incluse:** 5.1.23~ynh3 -![](screenshot.png) +**Démo :** https://tiddlywiki.com/ -## Démo +## Captures d'écran -* [Démo officielle](https://tiddlywiki.com/) +![](./doc/screenshots/.DS_Store) +![](./doc/screenshots/screenshot.png) -## Documentation +## Documentations et ressources - * Documentation officielle : https://tiddlywiki.com/languages/fr-FR/index.html - * Documentation YunoHost : Si une documentation spécifique est nécessaire, n'hésitez pas à contribuer. - -#### Architectures supportées - -* x86-64 - [![Build Status](https://ci-apps.yunohost.org/ci/logs/tiddlywiki.svg)](https://ci-apps.yunohost.org/ci/apps/tiddlywiki/) -* ARMv8-A - [![Build Status](https://ci-apps-arm.yunohost.org/ci/logs/tiddlywiki.svg)](https://ci-apps-arm.yunohost.org/ci/apps/tiddlywiki/) - -## Liens - - * Signaler un bug : https://github.com/YunoHost-Apps/tiddlywiki_ynh/issues - * Site de l'application : https://tiddlywiki.com/ - * Dépôt de l’application principale : https://github.com/Jermolene/TiddlyWiki5 - * Site web YunoHost : https://yunohost.org/ - ---- +* Site officiel de l'app : https://tiddlywiki.com/ +* Documentation officielle de l'admin : https://tiddlywiki.com/ +* Dépôt de code officiel de l'app : https://github.com/Jermolene/TiddlyWiki5 +* Documentation YunoHost pour cette app : https://yunohost.org/app_tiddlywiki +* Signaler un bug: https://github.com/YunoHost-Apps/tiddlywiki_ynh/issues ## Informations pour les développeurs @@ -48,6 +37,8 @@ Merci de faire vos pull request sur la [branche testing](https://github.com/Yuno Pour essayer la branche testing, procédez comme suit. ``` sudo yunohost app install https://github.com/YunoHost-Apps/tiddlywiki_ynh/tree/testing --debug -ou +or sudo yunohost app upgrade tiddlywiki -u https://github.com/YunoHost-Apps/tiddlywiki_ynh/tree/testing --debug ``` + +**Plus d'infos sur le packaging d'applications:** https://yunohost.org/packaging_apps \ No newline at end of file From 509a78737017d71542434501d57e0285f09eb1b4 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Thu, 24 Jun 2021 18:54:05 +0200 Subject: [PATCH 02/16] Update systemd.service --- conf/systemd.service | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/systemd.service b/conf/systemd.service index e5a3e1c..711df10 100755 --- a/conf/systemd.service +++ b/conf/systemd.service @@ -9,7 +9,7 @@ Group=__APP__ WorkingDirectory=__FINALPATH__ Environment=PATH=__ENV_PATH__ Environment=NODE_ENV=production -ExecStart=__YNH_NODE__ tiddlywiki ++languages/fr-FR mynewwiki --listen port=__PORT__ username=__ADMIN__ password=__PASSWORD__ +ExecStart=__YNH_NODE__ tiddlywiki ++languages/fr-FR mynewwiki --init server --listen port=__PORT__ username=__ADMIN__ password=__PASSWORD__ Restart=always [Install] From 71a63fe7677a84dcf9569507825576cf7d15ca87 Mon Sep 17 00:00:00 2001 From: Yunohost-Bot <> Date: Thu, 24 Jun 2021 16:54:13 +0000 Subject: [PATCH 03/16] Auto-update README --- README.md | 2 +- README_fr.md | 22 +++++++++++----------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/README.md b/README.md index d43b0a8..d0c453f 100644 --- a/README.md +++ b/README.md @@ -30,7 +30,7 @@ A non-linear personal web notebook * Official app website: https://tiddlywiki.com/ * Official admin documentation: https://tiddlywiki.com/ -* Upstream app code repository: https://github.com/Jermolene/TiddlyWiki5 +* Upstream app code repository: https://github.com/Jermolene/TiddlyWiki5 * YunoHost documentation for this app: https://yunohost.org/app_tiddlywiki * Report a bug: https://github.com/YunoHost-Apps/tiddlywiki_ynh/issues diff --git a/README_fr.md b/README_fr.md index 51d6fe4..6a22f04 100644 --- a/README_fr.md +++ b/README_fr.md @@ -6,16 +6,16 @@ *[Read this readme in english.](./README.md)* *[Lire ce readme en français.](./README_fr.md)* -> *This package allows you to install TiddlyWiki 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.* +> *Ce package vous permet d'installer TiddlyWiki 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 Un carnet Web personnel non linéaire -**Version incluse:** 5.1.23~ynh3 +**Version incluse :** 5.1.23~ynh3 -**Démo :** https://tiddlywiki.com/ +**Démo :** https://tiddlywiki.com/ ## Captures d'écran @@ -24,11 +24,11 @@ Un carnet Web personnel non linéaire ## Documentations et ressources -* Site officiel de l'app : https://tiddlywiki.com/ -* Documentation officielle de l'admin : https://tiddlywiki.com/ -* Dépôt de code officiel de l'app : https://github.com/Jermolene/TiddlyWiki5 -* Documentation YunoHost pour cette app : https://yunohost.org/app_tiddlywiki -* Signaler un bug: https://github.com/YunoHost-Apps/tiddlywiki_ynh/issues +* Site officiel de l'app : https://tiddlywiki.com/ +* Documentation officielle de l'admin : https://tiddlywiki.com/ +* Dépôt de code officiel de l'app : https://github.com/Jermolene/TiddlyWiki5 +* Documentation YunoHost pour cette app : https://yunohost.org/app_tiddlywiki +* Signaler un bug : https://github.com/YunoHost-Apps/tiddlywiki_ynh/issues ## Informations pour les développeurs @@ -37,8 +37,8 @@ Merci de faire vos pull request sur la [branche testing](https://github.com/Yuno Pour essayer la branche testing, procédez comme suit. ``` sudo yunohost app install https://github.com/YunoHost-Apps/tiddlywiki_ynh/tree/testing --debug -or +ou sudo yunohost app upgrade tiddlywiki -u https://github.com/YunoHost-Apps/tiddlywiki_ynh/tree/testing --debug ``` -**Plus d'infos sur le packaging d'applications:** https://yunohost.org/packaging_apps \ No newline at end of file +**Plus d'infos sur le packaging d'applications :** https://yunohost.org/packaging_apps \ No newline at end of file From 4db96b78ff704f41648c391aa917422c00ace960 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Thu, 24 Jun 2021 19:05:07 +0200 Subject: [PATCH 04/16] fix --- conf/systemd.service | 2 +- scripts/install | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/conf/systemd.service b/conf/systemd.service index 711df10..e5a3e1c 100755 --- a/conf/systemd.service +++ b/conf/systemd.service @@ -9,7 +9,7 @@ Group=__APP__ WorkingDirectory=__FINALPATH__ Environment=PATH=__ENV_PATH__ Environment=NODE_ENV=production -ExecStart=__YNH_NODE__ tiddlywiki ++languages/fr-FR mynewwiki --init server --listen port=__PORT__ username=__ADMIN__ password=__PASSWORD__ +ExecStart=__YNH_NODE__ tiddlywiki ++languages/fr-FR mynewwiki --listen port=__PORT__ username=__ADMIN__ password=__PASSWORD__ Restart=always [Install] diff --git a/scripts/install b/scripts/install index e68d12a..3328512 100755 --- a/scripts/install +++ b/scripts/install @@ -107,7 +107,7 @@ ynh_script_progression --message="Configuring TiddlyWiki..." --weight=2 pushd $final_path ynh_use_nodejs npm install -g tiddlywiki - tiddlywiki mynewwiki --init server + env $ynh_node_load_PATH tiddlywiki mynewwiki --init server popd #================================================= @@ -116,7 +116,6 @@ pushd $final_path ynh_script_progression --message="Configuring a systemd service..." --weight=1 ynh_replace_string --match_string="__ENV_PATH__" --replace_string="$PATH" --target_file=../conf/systemd.service -ynh_replace_string --match_string="__YNH_NODE__" --replace_string="$ynh_node" --target_file=../conf/systemd.service ynh_add_systemd_config From 0961bd67fb6767022a2b8419d04c9004b499270a Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Thu, 24 Jun 2021 19:20:05 +0200 Subject: [PATCH 05/16] fix --- conf/systemd.service | 2 +- scripts/install | 4 +++- scripts/upgrade | 1 - 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/conf/systemd.service b/conf/systemd.service index e5a3e1c..9bd150f 100755 --- a/conf/systemd.service +++ b/conf/systemd.service @@ -9,7 +9,7 @@ Group=__APP__ WorkingDirectory=__FINALPATH__ Environment=PATH=__ENV_PATH__ Environment=NODE_ENV=production -ExecStart=__YNH_NODE__ tiddlywiki ++languages/fr-FR mynewwiki --listen port=__PORT__ username=__ADMIN__ password=__PASSWORD__ +ExecStart=__YNH_NODE__ tiddlywiki ++languages/fr-FR wiki --listen port=__PORT__ username=__ADMIN__ password=__PASSWORD__ Restart=always [Install] diff --git a/scripts/install b/scripts/install index 3328512..313dfb4 100755 --- a/scripts/install +++ b/scripts/install @@ -107,9 +107,11 @@ ynh_script_progression --message="Configuring TiddlyWiki..." --weight=2 pushd $final_path ynh_use_nodejs npm install -g tiddlywiki - env $ynh_node_load_PATH tiddlywiki mynewwiki --init server + env $ynh_node_load_PATH tiddlywiki wiki --init server popd +#mkdir $final_path/wiki/tiddlers + #================================================= # SETUP SYSTEMD #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index 0afd25c..d3fef9d 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -118,7 +118,6 @@ ynh_install_nodejs --nodejs_version=$nodejs_version ynh_script_progression --message="Upgrading systemd configuration..." --weight=1 ynh_replace_string --match_string="__ENV_PATH__" --replace_string="$PATH" --target_file=../conf/systemd.service -ynh_replace_string --match_string="__YNH_NODE__" --replace_string="$ynh_node" --target_file=../conf/systemd.service ynh_add_systemd_config From e6818fdd779f13b2b0204bad09546018122eab2c Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Thu, 24 Jun 2021 19:27:35 +0200 Subject: [PATCH 06/16] Fix --- conf/systemd.service | 2 +- scripts/install | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/conf/systemd.service b/conf/systemd.service index 9bd150f..e5a3e1c 100755 --- a/conf/systemd.service +++ b/conf/systemd.service @@ -9,7 +9,7 @@ Group=__APP__ WorkingDirectory=__FINALPATH__ Environment=PATH=__ENV_PATH__ Environment=NODE_ENV=production -ExecStart=__YNH_NODE__ tiddlywiki ++languages/fr-FR wiki --listen port=__PORT__ username=__ADMIN__ password=__PASSWORD__ +ExecStart=__YNH_NODE__ tiddlywiki ++languages/fr-FR mynewwiki --listen port=__PORT__ username=__ADMIN__ password=__PASSWORD__ Restart=always [Install] diff --git a/scripts/install b/scripts/install index 313dfb4..9254255 100755 --- a/scripts/install +++ b/scripts/install @@ -107,7 +107,7 @@ ynh_script_progression --message="Configuring TiddlyWiki..." --weight=2 pushd $final_path ynh_use_nodejs npm install -g tiddlywiki - env $ynh_node_load_PATH tiddlywiki wiki --init server + env $ynh_node_load_PATH $final_path/tiddlywiki mynewwiki --init server popd #mkdir $final_path/wiki/tiddlers From 3b09140b7e4a3f96ea32c662ed0747eb9135b78a Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Thu, 24 Jun 2021 19:29:45 +0200 Subject: [PATCH 07/16] Update install --- scripts/install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/install b/scripts/install index 9254255..85a09f3 100755 --- a/scripts/install +++ b/scripts/install @@ -107,7 +107,7 @@ ynh_script_progression --message="Configuring TiddlyWiki..." --weight=2 pushd $final_path ynh_use_nodejs npm install -g tiddlywiki - env $ynh_node_load_PATH $final_path/tiddlywiki mynewwiki --init server + env $ynh_node_load_PATH $final_path mynewwiki --init server popd #mkdir $final_path/wiki/tiddlers From c6ec2fa1bc3edd8035db6923e69e1ecd95cbfa7e Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Thu, 24 Jun 2021 19:32:08 +0200 Subject: [PATCH 08/16] Update install --- scripts/install | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/install b/scripts/install index 85a09f3..587c10e 100755 --- a/scripts/install +++ b/scripts/install @@ -104,13 +104,13 @@ ynh_add_nginx_config #================================================= ynh_script_progression --message="Configuring TiddlyWiki..." --weight=2 +#chown -R $app $final_path + pushd $final_path ynh_use_nodejs npm install -g tiddlywiki - env $ynh_node_load_PATH $final_path mynewwiki --init server - popd - -#mkdir $final_path/wiki/tiddlers + ynh_exec_as $app env $ynh_node_load_PATH $final_path mynewwiki --init server +popd #================================================= # SETUP SYSTEMD From a6408772e605bd30a9b848355688c9920e123fc1 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Thu, 24 Jun 2021 19:33:49 +0200 Subject: [PATCH 09/16] Update install --- scripts/install | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/scripts/install b/scripts/install index 587c10e..9a9a2e9 100755 --- a/scripts/install +++ b/scripts/install @@ -87,10 +87,6 @@ ynh_app_setting_set --app=$app --key=final_path --value=$final_path # Download, check integrity, uncompress and patch the source from app.src ynh_setup_source --dest_dir=$final_path -chmod 750 "$final_path" -chmod -R o-rwx "$final_path" -chown -R $app:www-data "$final_path" - #================================================= # NGINX CONFIGURATION #================================================= @@ -104,7 +100,7 @@ ynh_add_nginx_config #================================================= ynh_script_progression --message="Configuring TiddlyWiki..." --weight=2 -#chown -R $app $final_path +chown -R $app: $final_path pushd $final_path ynh_use_nodejs @@ -112,6 +108,10 @@ pushd $final_path ynh_exec_as $app env $ynh_node_load_PATH $final_path mynewwiki --init server popd +chmod 750 "$final_path" +chmod -R o-rwx "$final_path" +chown -R $app:www-data "$final_path" + #================================================= # SETUP SYSTEMD #================================================= From 6ebb86d61fa6a2541247c2541f390062e84335bb Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Thu, 24 Jun 2021 19:35:38 +0200 Subject: [PATCH 10/16] Update install --- scripts/install | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/scripts/install b/scripts/install index 9a9a2e9..dbe2446 100755 --- a/scripts/install +++ b/scripts/install @@ -87,6 +87,10 @@ ynh_app_setting_set --app=$app --key=final_path --value=$final_path # Download, check integrity, uncompress and patch the source from app.src ynh_setup_source --dest_dir=$final_path +chmod 750 "$final_path" +chmod -R o-rwx "$final_path" +chown -R $app:www-data "$final_path" + #================================================= # NGINX CONFIGURATION #================================================= @@ -100,18 +104,14 @@ ynh_add_nginx_config #================================================= ynh_script_progression --message="Configuring TiddlyWiki..." --weight=2 -chown -R $app: $final_path +#chown -R $app $final_path pushd $final_path ynh_use_nodejs npm install -g tiddlywiki - ynh_exec_as $app env $ynh_node_load_PATH $final_path mynewwiki --init server + $final_path --init server popd -chmod 750 "$final_path" -chmod -R o-rwx "$final_path" -chown -R $app:www-data "$final_path" - #================================================= # SETUP SYSTEMD #================================================= From 45499132abedee5ec99eb08a6a32cb533d638cc4 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Thu, 24 Jun 2021 19:37:15 +0200 Subject: [PATCH 11/16] Update install --- scripts/install | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/scripts/install b/scripts/install index dbe2446..df3a311 100755 --- a/scripts/install +++ b/scripts/install @@ -104,12 +104,10 @@ ynh_add_nginx_config #================================================= ynh_script_progression --message="Configuring TiddlyWiki..." --weight=2 -#chown -R $app $final_path - pushd $final_path ynh_use_nodejs npm install -g tiddlywiki - $final_path --init server + env $ynh_node_load_PATH $final_path/mynewwiki --init server popd #================================================= From 0182a7a7de681dd2fecc10f125a6807115c89bb6 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Thu, 24 Jun 2021 19:38:46 +0200 Subject: [PATCH 12/16] Update install --- scripts/install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/install b/scripts/install index df3a311..8b7ea83 100755 --- a/scripts/install +++ b/scripts/install @@ -107,7 +107,7 @@ ynh_script_progression --message="Configuring TiddlyWiki..." --weight=2 pushd $final_path ynh_use_nodejs npm install -g tiddlywiki - env $ynh_node_load_PATH $final_path/mynewwiki --init server + env $ynh_node_load_PATH $final_path/tiddlywiki mynewwiki --init server popd #================================================= From 5245c4701b01f7c444f35a93290eb3849d23a2d3 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Thu, 24 Jun 2021 19:39:50 +0200 Subject: [PATCH 13/16] Update install --- scripts/install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/install b/scripts/install index 8b7ea83..4515a84 100755 --- a/scripts/install +++ b/scripts/install @@ -107,7 +107,7 @@ ynh_script_progression --message="Configuring TiddlyWiki..." --weight=2 pushd $final_path ynh_use_nodejs npm install -g tiddlywiki - env $ynh_node_load_PATH $final_path/tiddlywiki mynewwiki --init server + env $ynh_node_load_PATH $final_path tiddlywiki mynewwiki --init server popd #================================================= From ec7400a3fbaf3e32b2e1a4000b596fc2aafc59bb Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Thu, 24 Jun 2021 19:42:36 +0200 Subject: [PATCH 14/16] Update install --- scripts/install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/install b/scripts/install index 4515a84..35a6b12 100755 --- a/scripts/install +++ b/scripts/install @@ -107,7 +107,7 @@ ynh_script_progression --message="Configuring TiddlyWiki..." --weight=2 pushd $final_path ynh_use_nodejs npm install -g tiddlywiki - env $ynh_node_load_PATH $final_path tiddlywiki mynewwiki --init server + ynh_exec_as $app env $ynh_node_load_PATH tiddlywiki mynewwiki --init server popd #================================================= From f38a3eec764505b45e65e814e5d60c90e969acc3 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Thu, 24 Jun 2021 21:00:21 +0200 Subject: [PATCH 15/16] Update manifest.json --- manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.json b/manifest.json index 7ac9bec..fb52154 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~ynh3", + "version": "5.1.23~ynh4", "url": "https://tiddlywiki.com/", "upstream": { "license": "BSD-2-Clause", From 3e22d54ac49d1bb9d954ea64984e2537d825f3bd Mon Sep 17 00:00:00 2001 From: Yunohost-Bot <> Date: Thu, 24 Jun 2021 19:00:31 +0000 Subject: [PATCH 16/16] 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 d0c453f..82c6a2c 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~ynh3 +**Shipped version:** 5.1.23~ynh4 **Demo:** https://tiddlywiki.com/ diff --git a/README_fr.md b/README_fr.md index 6a22f04..dd49f76 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~ynh3 +**Version incluse :** 5.1.23~ynh4 **Démo :** https://tiddlywiki.com/