diff --git a/README.md b/README.md index 840720f..82c6a2c 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~ynh4 + +**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..dd49f76 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.* +> *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 -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~ynh4 -![](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 @@ -51,3 +40,5 @@ sudo yunohost app install https://github.com/YunoHost-Apps/tiddlywiki_ynh/tree/t 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 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", diff --git a/scripts/install b/scripts/install index e68d12a..35a6b12 100755 --- a/scripts/install +++ b/scripts/install @@ -107,8 +107,8 @@ ynh_script_progression --message="Configuring TiddlyWiki..." --weight=2 pushd $final_path ynh_use_nodejs npm install -g tiddlywiki - tiddlywiki mynewwiki --init server - popd + ynh_exec_as $app env $ynh_node_load_PATH tiddlywiki mynewwiki --init server +popd #================================================= # SETUP SYSTEMD @@ -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 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