From e220c88e4d44531cd2ffce7cfc5f6922ad55b34e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?F=C3=A9lix=20Pi=C3=A9dallu?= <felix.piedallu@non.se.com>
Date: Wed, 31 Jan 2024 16:43:29 +0100
Subject: [PATCH 1/4] Bump to v8.2

---
 manifest.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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"]
 

From e8a56f6c653df62f157b9ce0dd347834d323fa9a Mon Sep 17 00:00:00 2001
From: yunohost-bot <yunohost@yunohost.org>
Date: Wed, 31 Jan 2024 15:43:48 +0000
Subject: [PATCH 2/4] Auto-update README

---
 README.md    | 2 +-
 README_fr.md | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

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
 

From b5b880e467f8b07b81477536d3d18909b5458580 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?F=C3=A9lix=20Pi=C3=A9dallu?= <felix.piedallu@non.se.com>
Date: Wed, 31 Jan 2024 17:10:33 +0100
Subject: [PATCH 3/4] Adapt expect script to the new setup.py script

---
 conf/setup.exp  | 4 ++--
 scripts/install | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

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/scripts/install b/scripts/install
index 80cf3f2..2af0826 100644
--- a/scripts/install
+++ b/scripts/install
@@ -48,7 +48,7 @@ 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"

From a169185d9d18313eede2d17644f502e4b48848f5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?F=C3=A9lix=20Pi=C3=A9dallu?= <felix.piedallu@non.se.com>
Date: Wed, 31 Jan 2024 17:28:18 +0100
Subject: [PATCH 4/4] setup.py changed

---
 scripts/install | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/install b/scripts/install
index 2af0826..9cfdaca 100644
--- a/scripts/install
+++ b/scripts/install
@@ -51,7 +51,7 @@ 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" 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