diff --git a/README.md b/README.md index 2306316..079735d 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,7 @@ 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:** 7.8~ynh2 +**Shipped version:** 8.2~ynh2 ## Screenshots diff --git a/README_fr.md b/README_fr.md index a04ddc4..2da0f15 100644 --- a/README_fr.md +++ b/README_fr.md @@ -19,7 +19,7 @@ Si vous n’avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) po pgAdmin is a feature rich Open Source administration and development platform for PostgreSQL. -**Version incluse :** 7.8~ynh2 +**Version incluse :** 8.2~ynh2 ## Captures d’écran diff --git a/conf/setup.exp b/conf/setup.exp index 5c67097..2338cae 100755 --- a/conf/setup.exp +++ b/conf/setup.exp @@ -2,9 +2,9 @@ set timeout 20 set cmd [lindex $argv 0] -set path [lindex $argv 1] +set arguments [lrange $argv 1 end] -spawn $cmd $path +spawn $cmd {*}$arguments expect "Email address:" send "__EMAIL__\r"; diff --git a/manifest.toml b/manifest.toml index 849f864..1bb10cb 100644 --- a/manifest.toml +++ b/manifest.toml @@ -7,7 +7,7 @@ name = "pgAdmin4" description.en = "Manage PostgreSQL databases over the web" description.fr = "Application web de gestion des bases de données PostgreSQL" -version = "7.8~ynh2" +version = "8.2~ynh2" maintainers = ["Josué Tille"] diff --git a/scripts/install b/scripts/install index 80cf3f2..9cfdaca 100644 --- a/scripts/install +++ b/scripts/install @@ -48,10 +48,10 @@ chown -R "$app:root" "$install_dir" ynh_add_config --template="setup.exp" --destination="$install_dir/setup.exp" chmod +x "$install_dir/setup.exp" -ynh_exec_as "$app" "$install_dir/setup.exp" "$install_dir/venv/bin/python3" "$install_dir/venv/lib/python$python_version/site-packages/pgadmin4/setup.py" +ynh_exec_as "$app" "$install_dir/setup.exp" "$install_dir/venv/bin/python3" "$install_dir/venv/lib/python$python_version/site-packages/pgadmin4/setup.py" setup-db ynh_add_config --template="server.json" --destination="$install_dir/server.json" -ynh_exec_as "$app" "$install_dir/venv/bin/python3" "$install_dir/venv/lib/python$python_version/site-packages/pgadmin4/setup.py" --user "$email" --load-servers "$install_dir/server.json" +ynh_exec_as "$app" "$install_dir/venv/bin/python3" "$install_dir/venv/lib/python$python_version/site-packages/pgadmin4/setup.py" load-servers --user "$email" "$install_dir/server.json" # looks like we need to run one command as pgadmin to get access to the dbs ? ynh_psql_connect_as --user="$db_user" --password="$db_pwd" <<< '\list' >/dev/null