From a4202015cca98ebc5d894134fecfeb7fbacaeb69 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?F=C3=A9lix=20Pi=C3=A9dallu?= <felix@piedallu.me>
Date: Mon, 1 Apr 2024 00:17:55 +0200
Subject: [PATCH] Redefine postgresql_version as a function because helpers
 don't exist yet at _common.sh sourcing time

---
 scripts/_common.sh | 16 ++++++++--------
 scripts/install    |  2 +-
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/scripts/_common.sh b/scripts/_common.sh
index 48d1abf..8edb3df 100644
--- a/scripts/_common.sh
+++ b/scripts/_common.sh
@@ -7,12 +7,6 @@
 # NodeJS required version
 nodejs_version=20
 
-# PostgreSQL required version
-postgresql_version=$(
-	ynh_read_manifest --manifest_key="resources.apt.extras.postgresql.packages" \
-	| grep -o 'postgresql-[0-9][0-9]-pgvector' | head -n1 | cut -d'-' -f2
-)
-
 # Fail2ban
 failregex="immich-server.*Failed login attempt for user.+from ip address\s?<ADDR>"
 
@@ -20,6 +14,12 @@ failregex="immich-server.*Failed login attempt for user.+from ip address\s?<ADDR
 # PERSONAL HELPERS
 #=================================================
 
+# PostgreSQL required version
+postgresql_version() {
+	ynh_read_manifest --manifest_key="resources.apt.extras.postgresql.packages" \
+	| grep -o 'postgresql-[0-9][0-9]-pgvector' | head -n1 | cut -d'-' -f2
+}
+
 # Retrieve full latest python version from major version
 # usage: py_latest_from_major --python="3.8"
 # | arg: -p, --python=    - the major python version
@@ -230,7 +230,7 @@ myynh_execute_psql_as_root() {
 	fi
 
 	sudo --login --user=postgres PGUSER=postgres PGPASSWORD="$(cat $PSQL_ROOT_PWD_FILE)" \
-		psql --cluster="$postgresql_version/main" "$database" --command="$sql"
+		psql --cluster="$(postgresql_version)/main" "$database" --command="$sql"
 }
 
 # Install the database
@@ -264,7 +264,7 @@ myynh_restore_psql_db() {
 		--replace_string="SELECT pg_catalog.set_config('search_path', 'public, pg_catalog', true);" --target_file="db.sql"
 
 	sudo --login --user=postgres PGUSER=postgres PGPASSWORD="$(cat $PSQL_ROOT_PWD_FILE)" \
-		psql --cluster="$postgresql_version/main" --dbname="$app" < ./db.sql
+		psql --cluster="$(postgresql_version)/main" --dbname="$app" < ./db.sql
 }
 
 #=================================================
diff --git a/scripts/install b/scripts/install
index f0bf438..1014475 100755
--- a/scripts/install
+++ b/scripts/install
@@ -41,7 +41,7 @@ db_pwd=$(ynh_string_random)
 myynh_create_psql_db
 db_port=$(myynh_execute_psql_as_root --sql="\conninfo" | cut -d'"' -f8)
 ynh_app_setting_set --app="$app" --key=psql_pwd --value="$db_pwd"
-ynh_app_setting_set --app="$app" --key=psql_version --value="$postgresql_version"
+ynh_app_setting_set --app="$app" --key=psql_version --value="$(postgresql_version)"
 ynh_app_setting_set --app="$app" --key=psql_port --value="$db_port"
 
 #=================================================