mirror of
https://github.com/YunoHost-Apps/pgadmin_ynh.git
synced 2024-09-03 19:56:38 +02:00
Remove main version on app version
This commit is contained in:
parent
98c611c376
commit
8055180df7
5 changed files with 3 additions and 6 deletions
|
@ -1,12 +1,12 @@
|
||||||
{
|
{
|
||||||
"name": "pgAdmin",
|
"name": "pgAdmin4",
|
||||||
"id": "pgadmin",
|
"id": "pgadmin",
|
||||||
"packaging_format": 1,
|
"packaging_format": 1,
|
||||||
"description": {
|
"description": {
|
||||||
"en": "Manage PostgreSQL databases over the web",
|
"en": "Manage PostgreSQL databases over the web",
|
||||||
"fr": "Application web de gestion des bases de données PostgreSQL"
|
"fr": "Application web de gestion des bases de données PostgreSQL"
|
||||||
},
|
},
|
||||||
"version": "4-6.12~ynh1",
|
"version": "6.12~ynh1",
|
||||||
"url": "https://www.pgadmin.org",
|
"url": "https://www.pgadmin.org",
|
||||||
"upstream": {
|
"upstream": {
|
||||||
"license": "PostgreSQL",
|
"license": "PostgreSQL",
|
||||||
|
|
|
@ -61,7 +61,7 @@ install_source() {
|
||||||
pip3 install --upgrade pip
|
pip3 install --upgrade pip
|
||||||
pip3 install --upgrade 'Werkzeug<1.0'
|
pip3 install --upgrade 'Werkzeug<1.0'
|
||||||
pip3 install --upgrade 'markupsafe==2.0.1'
|
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;
|
set +$u_arg;
|
||||||
deactivate
|
deactivate
|
||||||
set -$u_arg;
|
set -$u_arg;
|
||||||
|
|
|
@ -32,7 +32,6 @@ admin_pwd=$YNH_APP_ARG_PASSWORD
|
||||||
db_user="pgadmin"
|
db_user="pgadmin"
|
||||||
db_pwd=$(ynh_string_random --length 30)
|
db_pwd=$(ynh_string_random --length 30)
|
||||||
app_version=$(ynh_app_upstream_version)
|
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_sub_version=$(echo $app_version | cut -d'-' -f2)
|
||||||
|
|
||||||
app=$YNH_APP_INSTANCE_NAME
|
app=$YNH_APP_INSTANCE_NAME
|
||||||
|
|
|
@ -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)
|
db_pwd=$(ynh_app_setting_get --app=$app --key=db_pwd)
|
||||||
|
|
||||||
app_version=$(ynh_app_upstream_version)
|
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_sub_version=$(echo $app_version | cut -d'-' -f2)
|
||||||
|
|
||||||
pgadmin_user="$app"
|
pgadmin_user="$app"
|
||||||
|
|
|
@ -23,7 +23,6 @@ admin=$(ynh_app_setting_get --app=$app --key=admin)
|
||||||
final_path=$(ynh_app_setting_get --app=$app --key=final_path)
|
final_path=$(ynh_app_setting_get --app=$app --key=final_path)
|
||||||
|
|
||||||
app_version=$(ynh_app_upstream_version)
|
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_sub_version=$(echo $app_version | cut -d'-' -f2)
|
||||||
|
|
||||||
pgadmin_user="$app"
|
pgadmin_user="$app"
|
||||||
|
|
Loading…
Reference in a new issue