From: Thierry Parmentelat <thierry.parmentelat@inria.fr>
Date: Thu, 21 Nov 2024 09:53:22 +0000 (+0100)
Subject: plc.d/db was creating .sql.sql files when applying migrations
X-Git-Tag: plcapi-7.2-5~4
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=84cbb5c0e67ef2a1ae95f64fb4f2ebf4c4e61fe6;p=plcapi.git

plc.d/db was creating .sql.sql files when applying migrations
---

diff --git a/plc.d/db b/plc.d/db
index d046692c..49f177a2 100755
--- a/plc.d/db
+++ b/plc.d/db
@@ -115,7 +115,13 @@ DATE=$(date +"%Y-%m-%d-%H-%M-%S")
 
 # Dumps the database - optional argument to specify filename suffix
 function dump_planetlab_db() {
-	if [ -n "$1" ]; then suffix="-$1"; else suffix=""; fi
+	if [ -n "$1" ]; then
+		# avoid ending with .sql.sql
+		suffix=$(basename -- "$1" .sql)
+		suffix="-$suffix"
+	else
+		suffix=""
+	fi
 	dumpfile=/var/lib/pgsql/backups/$(date +"${PLC_DB_NAME}.${DATE}${suffix}.sql")
 	checkpoint_planetlab_db $dumpfile
 }