Declare variables local.

eldering · vmcj · commit 30a7d2951519 · 2023-05-29T10:12:35.000+02:00
This makes sure they're not set from a previous call to the function, which happened in my case and led to weird buggy behaviour. (cherry picked from commit 5dd3538)
diff --git a/sql/dj_setup_database.in b/sql/dj_setup_database.in
@@ -51,6 +51,8 @@ EOF
 # Wrapper around mysql command to allow setting options, user, etc.
 mysql()
 {
+	local user pass
+
 	# shellcheck disable=SC2153
 	if [ -n "$DBUSER" ]; then
 		user="-u $DBUSER"

Original file line number	Diff line number	Diff line change
`@@ -51,6 +51,8 @@ EOF`
`51`	`51`	`# Wrapper around mysql command to allow setting options, user, etc.`
`52`	`52`	`mysql()`
`53`	`53`	`{`
	`54`	`+ local user pass`
	`55`	`+`
`54`	`56`	`# shellcheck disable=SC2153`
`55`	`57`	`if [ -n "$DBUSER" ]; then`
`56`	`58`	`user="-u $DBUSER"`