From ad51f29786072ea25a92c23a96c36bdfbc15400b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Tue, 27 Sep 2022 15:50:38 +0200 Subject: [PATCH] Testing (#123) * 5.1.3 (#119) * 5.1.3 * Auto-update README Co-authored-by: Yunohost-Bot <> * Bullseye (#122) * set relative path for --keep opt * Auto-update README Co-authored-by: yunohost-bot Co-authored-by: yunohost-bot --- README.md | 20 +++++++++++--------- README_fr.md | 28 +++++++++++++++++----------- manifest.json | 4 ++-- scripts/_common.sh | 2 +- scripts/upgrade | 2 +- 5 files changed, 32 insertions(+), 24 deletions(-) diff --git a/README.md b/README.md index 199e713..b869536 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ It shall NOT be edited by hand. # phpMyAdmin for YunoHost -[![Integration level](https://dash.yunohost.org/integration/phpmyadmin.svg)](https://dash.yunohost.org/appci/app/phpmyadmin) ![](https://ci-apps.yunohost.org/ci/badges/phpmyadmin.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/phpmyadmin.maintain.svg) +[![Integration level](https://dash.yunohost.org/integration/phpmyadmin.svg)](https://dash.yunohost.org/appci/app/phpmyadmin) ![Working status](https://ci-apps.yunohost.org/ci/badges/phpmyadmin.status.svg) ![Maintenance status](https://ci-apps.yunohost.org/ci/badges/phpmyadmin.maintain.svg) [![Install phpMyAdmin with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=phpmyadmin) *[Lire ce readme en français.](./README_fr.md)* @@ -19,11 +19,12 @@ Manage MySQL databases over the web **Shipped version:** 5.1.3~ynh1 + **Demo:** https://demo.phpmyadmin.net/master-config ## Screenshots -![](./doc/screenshots/68747470733a2f2f7777772e7068706d7961646d696e2e6e65742f7374617469632f696d616765732f73637265656e73686f74732f7374727563747572652e706e67.png) +![Screenshot of phpMyAdmin](./doc/screenshots/68747470733a2f2f7777772e7068706d7961646d696e2e6e65742f7374617469632f696d616765732f73637265656e73686f74732f7374727563747572652e706e67.png) ## Disclaimers / important information @@ -32,21 +33,22 @@ Manage MySQL databases over the web phpMyAdmin is a free software tool written in PHP, intended to handle the administration of MySQL over the Web. phpMyAdmin supports a wide range of operations on MySQL and MariaDB. Frequently used operations (managing databases, tables, columns, relations, indexes, users, permissions, etc) can be performed via the user interface, while you still have the ability to directly execute any SQL statement. ## Documentation and resources -* Official app website: http://www.phpmyadmin.net -* Official admin documentation: https://www.phpmyadmin.net/docs/ -* Upstream app code repository: https://github.com/phpmyadmin/phpmyadmin -* YunoHost documentation for this app: https://yunohost.org/app_phpmyadmin -* Report a bug: https://github.com/YunoHost-Apps/phpmyadmin_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/phpmyadmin_ynh/tree/testing). To try the testing branch, please proceed like that. -``` + +``` bash sudo yunohost app install https://github.com/YunoHost-Apps/phpmyadmin_ynh/tree/testing --debug or sudo yunohost app upgrade phpmyadmin -u https://github.com/YunoHost-Apps/phpmyadmin_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 b14a201..9ecd254 100644 --- a/README_fr.md +++ b/README_fr.md @@ -1,10 +1,14 @@ + + # phpMyAdmin pour YunoHost -[![Niveau d'intégration](https://dash.yunohost.org/integration/phpmyadmin.svg)](https://dash.yunohost.org/appci/app/phpmyadmin) ![](https://ci-apps.yunohost.org/ci/badges/phpmyadmin.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/phpmyadmin.maintain.svg) +[![Niveau d'intégration](https://dash.yunohost.org/integration/phpmyadmin.svg)](https://dash.yunohost.org/appci/app/phpmyadmin) ![Statut du fonctionnement](https://ci-apps.yunohost.org/ci/badges/phpmyadmin.status.svg) ![Statut de maintenance](https://ci-apps.yunohost.org/ci/badges/phpmyadmin.maintain.svg) [![Installer phpMyAdmin avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=phpmyadmin) *[Read this readme in english.](./README.md)* -*[Lire ce readme en français.](./README_fr.md)* > *Ce package vous permet d'installer phpMyAdmin 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,13 +17,14 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour Application web de gestion des bases de données MySQL -**Version incluse :** 5.1.3~ynh1 +**Version incluse :** 5.1.3~ynh1 + **Démo :** https://demo.phpmyadmin.net/master-config ## Captures d'écran -![](./doc/screenshots/68747470733a2f2f7777772e7068706d7961646d696e2e6e65742f7374617469632f696d616765732f73637265656e73686f74732f7374727563747572652e706e67.png) +![Capture d'écran de phpMyAdmin](./doc/screenshots/68747470733a2f2f7777772e7068706d7961646d696e2e6e65742f7374617469632f696d616765732f73637265656e73686f74732f7374727563747572652e706e67.png) ## Avertissements / informations importantes @@ -28,21 +33,22 @@ Application web de gestion des bases de données MySQL phpMyAdmin est un outil logiciel libre écrit en PHP, destiné à gérer l'administration de MySQL sur le Web. phpMyAdmin prend en charge un large éventail d'opérations sur MySQL et MariaDB. Les opérations fréquemment utilisées (gestion des bases de données, des tables, des colonnes, des relations, des index, des utilisateurs, des autorisations, etc.) peuvent être effectuées via l'interface utilisateur, tandis que vous avez toujours la possibilité d'exécuter directement les instructions SQL. ## Documentations et ressources -* Site officiel de l'app : http://www.phpmyadmin.net -* Documentation officielle de l'admin : https://www.phpmyadmin.net/docs/ -* Dépôt de code officiel de l'app : https://github.com/phpmyadmin/phpmyadmin -* Documentation YunoHost pour cette app : https://yunohost.org/app_phpmyadmin -* Signaler un bug : https://github.com/YunoHost-Apps/phpmyadmin_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/phpmyadmin_ynh/tree/testing). Pour essayer la branche testing, procédez comme suit. -``` + +``` bash sudo yunohost app install https://github.com/YunoHost-Apps/phpmyadmin_ynh/tree/testing --debug ou sudo yunohost app upgrade phpmyadmin -u https://github.com/YunoHost-Apps/phpmyadmin_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/manifest.json b/manifest.json index 94bee0c..c231eab 100644 --- a/manifest.json +++ b/manifest.json @@ -21,12 +21,12 @@ "email": "julien.malik@paraiso.me" }, "requirements": { - "yunohost": ">= 4.3.0" + "yunohost": ">= 11.0.9" }, "multi_instance": false, "services": [ "nginx", - "php7.3-fpm", + "php7.4-fpm", "mysql" ], "arguments": { diff --git a/scripts/_common.sh b/scripts/_common.sh index e07fa79..2babaa3 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -4,7 +4,7 @@ # COMMON VARIABLES #================================================= -YNH_PHP_VERSION="7.3" +YNH_PHP_VERSION="7.4" pkg_dependencies="php${YNH_PHP_VERSION}-xml php${YNH_PHP_VERSION}-curl php${YNH_PHP_VERSION}-zip php${YNH_PHP_VERSION}-mysql php${YNH_PHP_VERSION}-mbstring" diff --git a/scripts/upgrade b/scripts/upgrade index 425d2f1..4a2288b 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -110,7 +110,7 @@ then ynh_script_progression --message="Upgrading source files..." --weight=5 # Download, check integrity, uncompress and patch the source from app.src - ynh_setup_source --dest_dir="$final_path" --keep="$final_path/config.inc.php" + ynh_setup_source --dest_dir="$final_path" --keep="config.inc.php" fi chmod 750 "$final_path"