diff --git a/README.md b/README.md index 7728593..976d120 100644 --- a/README.md +++ b/README.md @@ -3,14 +3,14 @@ N.B.: This README was automatically generated by https://github.com/YunoHost/app It shall NOT be edited by hand. --> -# pgAdmin for YunoHost +# pgAdmin4 for YunoHost -[![Integration level](https://dash.yunohost.org/integration/pgadmin.svg)](https://dash.yunohost.org/appci/app/pgadmin) ![](https://ci-apps.yunohost.org/ci/badges/pgadmin.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/pgadmin.maintain.svg) -[![Install pgAdmin with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=pgadmin) +[![Integration level](https://dash.yunohost.org/integration/pgadmin.svg)](https://dash.yunohost.org/appci/app/pgadmin) ![Working status](https://ci-apps.yunohost.org/ci/badges/pgadmin.status.svg) ![Maintenance status](https://ci-apps.yunohost.org/ci/badges/pgadmin.maintain.svg) +[![Install pgAdmin4 with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=pgadmin) *[Lire ce readme en français.](./README_fr.md)* -> *This package allows you to install pgAdmin quickly and simply on a YunoHost server. +> *This package allows you to install pgAdmin4 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 @@ -18,13 +18,12 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in pgAdmin is a feature rich Open Source administration and development platform for PostgreSQL. -**Shipped version:** 4-5.7~ynh1 - +**Shipped version:** 6.14~ynh1 ## Screenshots -![](./doc/screenshots/pgadmin4-welcome-light.png) +![Screenshot of pgAdmin4](./doc/screenshots/pgadmin4-welcome-light.png) ## Disclaimers / important information @@ -34,20 +33,21 @@ This app actually don't support the SSO and don't support LDAP. After the instal ## Documentation and resources -* Official app website: https://www.pgadmin.org -* Official admin documentation: https://www.pgadmin.org/docs -* YunoHost documentation for this app: https://yunohost.org/app_pgadmin -* Report a bug: https://github.com/YunoHost-Apps/pgadmin_ynh/issues +* Official app website: +* Official admin documentation: +* YunoHost documentation for this app: +* Report a bug: ## Developer info Please send your pull request to the [testing branch](https://github.com/YunoHost-Apps/pgadmin_ynh/tree/testing). To try the testing branch, please proceed like that. -``` + +``` bash sudo yunohost app install https://github.com/YunoHost-Apps/pgadmin_ynh/tree/testing --debug or sudo yunohost app upgrade pgadmin -u https://github.com/YunoHost-Apps/pgadmin_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 72c174c..d39eedb 100644 --- a/README_fr.md +++ b/README_fr.md @@ -1,12 +1,16 @@ -# pgAdmin pour YunoHost + -[![Niveau d'intégration](https://dash.yunohost.org/integration/pgadmin.svg)](https://dash.yunohost.org/appci/app/pgadmin) ![](https://ci-apps.yunohost.org/ci/badges/pgadmin.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/pgadmin.maintain.svg) -[![Installer pgAdmin avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=pgadmin) +# pgAdmin4 pour YunoHost + +[![Niveau d'intégration](https://dash.yunohost.org/integration/pgadmin.svg)](https://dash.yunohost.org/appci/app/pgadmin) ![Statut du fonctionnement](https://ci-apps.yunohost.org/ci/badges/pgadmin.status.svg) ![Statut de maintenance](https://ci-apps.yunohost.org/ci/badges/pgadmin.maintain.svg) +[![Installer pgAdmin4 avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=pgadmin) *[Read this readme in english.](./README.md)* -*[Lire ce readme en français.](./README_fr.md)* -> *Ce package vous permet d'installer pgAdmin rapidement et simplement sur un serveur YunoHost. +> *Ce package vous permet d'installer pgAdmin4 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 @@ -14,13 +18,12 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour pgAdmin is a feature rich Open Source administration and development platform for PostgreSQL. -**Version incluse :** 4-5.7~ynh1 - +**Version incluse :** 6.14~ynh1 ## Captures d'écran -![](./doc/screenshots/pgadmin4-welcome-light.png) +![Capture d'écran de pgAdmin4](./doc/screenshots/pgadmin4-welcome-light.png) ## Avertissements / informations importantes @@ -30,20 +33,21 @@ This app actually don't support the SSO and don't support LDAP. After the instal ## Documentations et ressources -* Site officiel de l'app : https://www.pgadmin.org -* Documentation officielle de l'admin : https://www.pgadmin.org/docs -* Documentation YunoHost pour cette app : https://yunohost.org/app_pgadmin -* Signaler un bug : https://github.com/YunoHost-Apps/pgadmin_ynh/issues +* Site officiel de l'app : +* Documentation officielle de l'admin : +* 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/pgadmin_ynh/tree/testing). Pour essayer la branche testing, procédez comme suit. -``` + +``` bash sudo yunohost app install https://github.com/YunoHost-Apps/pgadmin_ynh/tree/testing --debug ou sudo yunohost app upgrade pgadmin -u https://github.com/YunoHost-Apps/pgadmin_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/check_process b/check_process index 0411059..b42cec3 100644 --- a/check_process +++ b/check_process @@ -12,7 +12,6 @@ setup_private=0 setup_public=0 upgrade=1 - # upgrade=1 from_commit=CommitHash backup_restore=1 multi_instance=0 port_already_use=0 @@ -20,3 +19,4 @@ ;;; Options Email= Notification=none +;;; Upgrade options diff --git a/conf/armv7_bullseye.src b/conf/armv7_bullseye.src index 831ced1..f1d9967 100644 --- a/conf/armv7_bullseye.src +++ b/conf/armv7_bullseye.src @@ -1,5 +1,5 @@ SOURCE_URL=https://github.com/Josue-T/pgadmin_python_build/releases/download/v4-4.30/pgadmin_4-4.30-stretch-bin1_armv7l.tar.gz -SOURCE_SUM=bc804655cccc478e48636fabeb03ebc087a1fd76610fed1d80437072cf8d0f7b +SOURCE_SUM=95f6ac5b3cd5b1d5a1a46502c51318471eb7d22a3031ce06b0c3b5ad33c622ea # (Optional) Program to check the integrity (sha256sum, md5sum...) # default: sha256 SOURCE_SUM_PRG=sha256sum diff --git a/conf/armv7_buster.src b/conf/armv7_buster.src index 93231d1..e500d84 100644 --- a/conf/armv7_buster.src +++ b/conf/armv7_buster.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/Josue-T/pgadmin_python_build/releases/download/v4-5.7/pgadmin_4-5.7-buster-bin1_armv7l.tar.gz -SOURCE_SUM=7cf02ebd462d6c1173d8cf60a306284abc82aec9660b949cf66d0335c54715d0 +SOURCE_URL=https://github.com/Josue-T/pgadmin_python_build/releases/download/v4-6.14/pgadmin_4-6.14-buster-bin1_armv7l.tar.gz +SOURCE_SUM=84ba3e94a8b79b6bfd90201bd600de33b726f72d5ebd5b3a3cfb5fad3c2def03 # (Optional) Program to check the integrity (sha256sum, md5sum...) # default: sha256 SOURCE_SUM_PRG=sha256sum diff --git a/manifest.json b/manifest.json index 3eda590..4225384 100644 --- a/manifest.json +++ b/manifest.json @@ -1,12 +1,12 @@ { - "name": "pgAdmin", + "name": "pgAdmin4", "id": "pgadmin", "packaging_format": 1, "description": { "en": "Manage PostgreSQL databases over the web", "fr": "Application web de gestion des bases de données PostgreSQL" }, - "version": "4-5.7~ynh1", + "version": "6.14~ynh1", "url": "https://www.pgadmin.org", "upstream": { "license": "PostgreSQL", diff --git a/scripts/_common.sh b/scripts/_common.sh index fe36ad6..ef18cc0 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -61,7 +61,7 @@ install_source() { pip3 install --upgrade pip pip3 install --upgrade 'Werkzeug<1.0' pip3 install --upgrade 'markupsafe==2.0.1' - pip3 install --upgrade pgadmin$app_main_version==$app_sub_version + pip3 install --upgrade pgadmin4==$app_sub_version set +$u_arg; deactivate set -$u_arg; diff --git a/scripts/install b/scripts/install index 349cf68..aaad63c 100644 --- a/scripts/install +++ b/scripts/install @@ -32,7 +32,6 @@ admin_pwd=$YNH_APP_ARG_PASSWORD db_user="pgadmin" db_pwd=$(ynh_string_random --length 30) app_version=$(ynh_app_upstream_version) -app_main_version=$(echo $app_version | cut -d'-' -f1) app_sub_version=$(echo $app_version | cut -d'-' -f2) app=$YNH_APP_INSTANCE_NAME diff --git a/scripts/restore b/scripts/restore index b68671e..7f494d0 100644 --- a/scripts/restore +++ b/scripts/restore @@ -36,7 +36,6 @@ db_user=$(ynh_app_setting_get --app=$app --key=db_user) db_pwd=$(ynh_app_setting_get --app=$app --key=db_pwd) app_version=$(ynh_app_upstream_version) -app_main_version=$(echo $app_version | cut -d'-' -f1) app_sub_version=$(echo $app_version | cut -d'-' -f2) pgadmin_user="$app" diff --git a/scripts/upgrade b/scripts/upgrade index 3d7c322..7c74faa 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -23,7 +23,6 @@ admin=$(ynh_app_setting_get --app=$app --key=admin) final_path=$(ynh_app_setting_get --app=$app --key=final_path) app_version=$(ynh_app_upstream_version) -app_main_version=$(echo $app_version | cut -d'-' -f1) app_sub_version=$(echo $app_version | cut -d'-' -f2) pgadmin_user="$app"