diff --git a/.DS_Store b/.DS_Store deleted file mode 100644 index 6e268bd..0000000 Binary files a/.DS_Store and /dev/null differ diff --git a/README.md b/README.md index 2c3df4d..7a57af2 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ It shall NOT be edited by hand. # 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) +[![Integration level](https://dash.yunohost.org/integration/tiddlywiki.svg)](https://dash.yunohost.org/appci/app/tiddlywiki) ![Working status](https://ci-apps.yunohost.org/ci/badges/tiddlywiki.status.svg) ![Maintenance status](https://ci-apps.yunohost.org/ci/badges/tiddlywiki.maintain.svg) [![Install TiddlyWiki with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=tiddlywiki) *[Lire ce readme en français.](./README_fr.md)* @@ -17,14 +17,14 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in 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.2.2~ynh1 +**Shipped version:** 5.2.2~ynh2 **Demo:** https://tiddlywiki.com/ ## Screenshots -![](./doc/screenshots/.DS_Store) -![](./doc/screenshots/screenshot.png) +![Screenshot of TiddlyWiki](./doc/screenshots/.DS_Store) +![Screenshot of TiddlyWiki](./doc/screenshots/screenshot.png) ## Disclaimers / important information @@ -39,21 +39,22 @@ To restore a local backup to the server, drag and drop your tiddlers backup file ## Documentation and resources -* 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 +* Official app website: +* Official admin documentation: +* Upstream app code repository: +* YunoHost documentation for this app: +* Report a bug: ## Developer info 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. -``` + +``` bash sudo yunohost app install https://github.com/YunoHost-Apps/tiddlywiki_ynh/tree/testing --debug 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 +**More info regarding app packaging:** diff --git a/README_fr.md b/README_fr.md index e019377..f6e0178 100644 --- a/README_fr.md +++ b/README_fr.md @@ -1,10 +1,14 @@ + + # TiddlyWiki pour YunoHost -[![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) +[![Niveau d'intégration](https://dash.yunohost.org/integration/tiddlywiki.svg)](https://dash.yunohost.org/appci/app/tiddlywiki) ![Statut du fonctionnement](https://ci-apps.yunohost.org/ci/badges/tiddlywiki.status.svg) ![Statut de maintenance](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)* -*[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.* @@ -13,14 +17,14 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour 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. -**Version incluse :** 5.2.2~ynh1 +**Version incluse :** 5.2.2~ynh2 **Démo :** https://tiddlywiki.com/ ## Captures d'écran -![](./doc/screenshots/.DS_Store) -![](./doc/screenshots/screenshot.png) +![Capture d'écran de TiddlyWiki](./doc/screenshots/.DS_Store) +![Capture d'écran de TiddlyWiki](./doc/screenshots/screenshot.png) ## Avertissements / informations importantes @@ -35,21 +39,22 @@ To restore a local backup to the server, drag and drop your tiddlers backup file ## 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 : +* Documentation officielle de l'admin : +* Dépôt de code officiel de l'app : +* Documentation YunoHost pour cette app : +* Signaler un bug : ## Informations pour les développeurs Merci de faire vos pull request sur la [branche testing](https://github.com/YunoHost-Apps/tiddlywiki_ynh/tree/testing). Pour essayer la branche testing, procédez comme suit. -``` + +``` bash sudo yunohost app install https://github.com/YunoHost-Apps/tiddlywiki_ynh/tree/testing --debug 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 :** diff --git a/conf/systemd.service b/conf/systemd.service index f494275..6e3c5b2 100755 --- a/conf/systemd.service +++ b/conf/systemd.service @@ -6,7 +6,7 @@ After=network.target Type=simple User=__APP__ Group=__APP__ -WorkingDirectory=__FINALPATH__ +WorkingDirectory=__FINALPATH__/ Environment=PATH=__ENV_PATH__ Environment=NODE_ENV=production ExecStart=__YNH_NODE__ tiddlywiki ++languages/fr-FR mynewwiki --listen port=__PORT__ diff --git a/manifest.json b/manifest.json index 146e9ff..5df7144 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Non-linear personal web notebook", "fr": "Carnet Web personnel non linéaire" }, - "version": "5.2.2~ynh1", + "version": "5.2.2~ynh2", "url": "https://tiddlywiki.com/", "upstream": { "license": "BSD-2-Clause", diff --git a/scripts/_common.sh b/scripts/_common.sh index 2f983d2..49686be 100755 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -4,7 +4,7 @@ # COMMON VARIABLES #================================================= -nodejs_version="14" +nodejs_version="18" tiddlywiki_version="5.2.2" diff --git a/scripts/install b/scripts/install index 9b4ebc9..10d50d2 100755 --- a/scripts/install +++ b/scripts/install @@ -99,7 +99,8 @@ ynh_script_progression --message="Configuring TiddlyWiki..." --weight=2 pushd $final_path ynh_use_nodejs - npm -g install tiddlywiki@${tiddlywiki_version} + npm install npm@latest --location=global + npm install tiddlywiki@${tiddlywiki_version} --location=global ynh_exec_as $app env $ynh_node_load_PATH tiddlywiki mynewwiki --init server popd diff --git a/scripts/upgrade b/scripts/upgrade index e1dbfd4..2f0c226 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -94,7 +94,8 @@ then pushd $final_path ynh_use_nodejs - npm update -g tiddlywiki@${tiddlywiki_version} + npm install npm@latest --location=global + npm update tiddlywiki --location=global popd fi