1
0
Fork 0
mirror of https://github.com/YunoHost-Apps/phpmyadmin_ynh.git synced 2024-09-03 19:56:46 +02:00
* Fix ynh_composer_exec syntax

* Bump yunohost requirement to 4.3

* Bump package version

* Auto-update README

* Fix linter warnings

* Auto-update README

Co-authored-by: Yunohost-Bot <>
Co-authored-by: ericgaspar <junk.eg@free.fr>
This commit is contained in:
Alexandre Aubin 2021-11-14 09:56:29 +01:00 committed by GitHub
parent 2eb247cf6f
commit 238323ab95
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 8 additions and 15 deletions

View file

@ -17,7 +17,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in
Manage MySQL databases over the web Manage MySQL databases over the web
**Shipped version:** 5.1.1~ynh1 **Shipped version:** 5.1.1~ynh2
**Demo:** https://demo.phpmyadmin.net/master-config **Demo:** https://demo.phpmyadmin.net/master-config
@ -33,7 +33,6 @@ phpMyAdmin is a free software tool written in PHP, intended to handle the admini
## Documentation and resources ## Documentation and resources
* Official app website: http://www.phpmyadmin.net * Official app website: http://www.phpmyadmin.net
* Official user documentation: https://yunohost.org/en/app_phpmyadmin
* Official admin documentation: https://www.phpmyadmin.net/docs/ * Official admin documentation: https://www.phpmyadmin.net/docs/
* Upstream app code repository: https://github.com/phpmyadmin/phpmyadmin * Upstream app code repository: https://github.com/phpmyadmin/phpmyadmin
* YunoHost documentation for this app: https://yunohost.org/app_phpmyadmin * YunoHost documentation for this app: https://yunohost.org/app_phpmyadmin

View file

@ -13,7 +13,7 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour
Application web de gestion des bases de données MySQL Application web de gestion des bases de données MySQL
**Version incluse :** 5.1.1~ynh1 **Version incluse :** 5.1.1~ynh2
**Démo :** https://demo.phpmyadmin.net/master-config **Démo :** https://demo.phpmyadmin.net/master-config
@ -29,7 +29,6 @@ phpMyAdmin est un outil logiciel libre écrit en PHP, destiné à gérer l'admin
## Documentations et ressources ## Documentations et ressources
* Site officiel de l'app : http://www.phpmyadmin.net * Site officiel de l'app : http://www.phpmyadmin.net
* Documentation officielle utilisateur : https://yunohost.org/en/app_phpmyadmin
* Documentation officielle de l'admin : https://www.phpmyadmin.net/docs/ * Documentation officielle de l'admin : https://www.phpmyadmin.net/docs/
* Dépôt de code officiel de l'app : https://github.com/phpmyadmin/phpmyadmin * Dépôt de code officiel de l'app : https://github.com/phpmyadmin/phpmyadmin
* Documentation YunoHost pour cette app : https://yunohost.org/app_phpmyadmin * Documentation YunoHost pour cette app : https://yunohost.org/app_phpmyadmin

View file

@ -6,14 +6,13 @@
"en": "Manage MySQL databases over the web", "en": "Manage MySQL databases over the web",
"fr": "Application web de gestion des bases de données MySQL" "fr": "Application web de gestion des bases de données MySQL"
}, },
"version": "5.1.1~ynh1", "version": "5.1.1~ynh2",
"url": "http://www.phpmyadmin.net", "url": "http://www.phpmyadmin.net",
"upstream": { "upstream": {
"license": "GPL-2.0-only", "license": "GPL-2.0-only",
"website": "http://www.phpmyadmin.net", "website": "http://www.phpmyadmin.net",
"demo": "https://demo.phpmyadmin.net/master-config", "demo": "https://demo.phpmyadmin.net/master-config",
"admindoc": "https://www.phpmyadmin.net/docs/", "admindoc": "https://www.phpmyadmin.net/docs/",
"userdoc": "https://yunohost.org/en/app_phpmyadmin",
"code": "https://github.com/phpmyadmin/phpmyadmin" "code": "https://github.com/phpmyadmin/phpmyadmin"
}, },
"license": "GPL-2.0-only", "license": "GPL-2.0-only",
@ -22,7 +21,7 @@
"email": "julien.malik@paraiso.me" "email": "julien.malik@paraiso.me"
}, },
"requirements": { "requirements": {
"yunohost": ">= 4.2.0" "yunohost": ">= 4.3.0"
}, },
"multi_instance": false, "multi_instance": false,
"services": [ "services": [
@ -34,8 +33,7 @@
"install" : [ "install" : [
{ {
"name": "domain", "name": "domain",
"type": "domain", "type": "domain"
"example": "domain.org"
}, },
{ {
"name": "path", "name": "path",
@ -45,8 +43,7 @@
}, },
{ {
"name": "admin", "name": "admin",
"type": "user", "type": "user"
"example": "johndoe"
} }
] ]
} }

View file

@ -34,8 +34,6 @@ db_name=$(ynh_app_setting_get --app=$app --key=db_name)
#================================================= #=================================================
ynh_script_progression --message="Validating restoration parameters..." --weight=2 ynh_script_progression --message="Validating restoration parameters..." --weight=2
ynh_webpath_available --domain=$domain --path_url=$path_url \
|| ynh_die --message="Path not available: ${domain}${path_url}"
test ! -d $final_path \ test ! -d $final_path \
|| ynh_die --message="There is already a directory: $final_path " || ynh_die --message="There is already a directory: $final_path "

View file

@ -181,9 +181,9 @@ then
ynh_script_progression --message="Upgrading dependencies with Composer..." --weight=19 ynh_script_progression --message="Upgrading dependencies with Composer..." --weight=19
# Force dependency to the used PHP version # Force dependency to the used PHP version
ynh_exec_warn_less ynh_composer_exec --commands=\"config -g platform.php $YNH_PHP_VERSION\" ynh_exec_warn_less ynh_composer_exec --commands="config -g platform.php $YNH_PHP_VERSION"
# Install dependencies # Install dependencies
ynh_exec_warn_less ynh_composer_exec --commands=\"update --no-dev\" ynh_exec_warn_less ynh_composer_exec --commands="update --no-dev"
fi fi
#================================================= #=================================================