From: Thierry Parmentelat <thierry.parmentelat@inria.fr>
Date: Thu, 21 Nov 2024 09:51:09 +0000 (+0100)
Subject: add local declarations in plc.d/db
X-Git-Tag: plcapi-7.2-5~5
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=7f93ef9ede395fa9f9f6cc9c05f9d6829319159a;p=plcapi.git

add local declarations in plc.d/db
---

diff --git a/plc.d/db b/plc.d/db
index 4d0ef8a0..d046692c 100755
--- a/plc.d/db
+++ b/plc.d/db
@@ -21,6 +21,7 @@ export PGPORT=$PLC_DB_PORT
 # Install extensions
 function extend_db() {
 	shopt -s nullglob
+	local script name extension version
 	for file in /usr/share/plc_api/extensions/*-up*; do
 		script=${file##*/}
 		name=${script%-up*}
@@ -69,10 +70,11 @@ function extend_db() {
 # current subversion. At least one of the migration scripts with the
 # same N must update plc_db_version.subversion.
 function migrate_db() {
-	subversion=$(psql -U $PLC_DB_USER --quiet --tuples-only --no-align -c \
+	local subversion=$(psql -U $PLC_DB_USER --quiet --tuples-only --no-align -c \
 		"SELECT subversion FROM plc_db_version LIMIT 1" \
 		$PLC_DB_NAME 2>/dev/null || echo 0)
 	shopt -s nullglob
+	local file script index extension
 	for file in /usr/share/plc_api/migrations/[0-9]*-up-*; do
 		script=$(basename $file)
 		index=${script%-up*}
@@ -95,8 +97,8 @@ function migrate_db() {
 }
 
 function checkpoint_planetlab_db() {
-	dumpfile=$1
 	pg_dump -U $PLC_DB_USER $PLC_DB_NAME >$dumpfile
+	local dumpfile="$1"; shift
 	check
 }
 
@@ -127,13 +129,13 @@ function restore_drupal_db() {
 }
 
 function checkpoint_drupal_db() {
-	dumpfile=$1
+	local dumpfile="$1"; shift
 	pg_dump -U $PLC_DB_USER drupal >$dumpfile
 	check
 }
 
 function dump_drupal_db() {
-	dumpfile=/var/lib/pgsql/backups/$(date +"drupal.${DATE}.sql")
+	local dumpfile=/var/lib/pgsql/backups/$(date +"drupal.${DATE}.sql")
 	checkpoint_drupal_db $dumpfile
 	check
 }