From 23b2271243c875fe8d1cd31161687447641f816d Mon Sep 17 00:00:00 2001
From: "Hahn Axel (hahn)" <axel.hahn@unibe.ch>
Date: Fri, 15 Mar 2024 14:54:53 +0100
Subject: [PATCH] change replacements: single brackets only
---
includes/dbdetect.class.sh | 10 +++++-----
plugins/localdump/profiles/couchdb2.ini | 2 +-
.../mysql_localhost_docker_13306.ini.example | 2 +-
plugins/localdump/profiles/pgsql.ini | 2 +-
.../localdump/profiles/pgsql_remote.ini.example | 2 +-
plugins/localdump/profiles/readme.md | 14 +++++++-------
6 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/includes/dbdetect.class.sh b/includes/dbdetect.class.sh
index ab2f32d..2a366c2 100644
--- a/includes/dbdetect.class.sh
+++ b/includes/dbdetect.class.sh
@@ -179,11 +179,11 @@ function dbdetect.exists(){
for mykey in env params
do
value="$( ini.value "$mykey" )"
- value="${value//\{\{tcp-port\}\}/$tcpport}"
- value="${value//\{\{tcp-target\}\}/$tcptarget}"
- value="${value//\{\{dbuser\}\}/$dbuser}"
- value="${value//\{\{dbpassword\}\}/$dbpassword}"
- value="${value//\{\{file\[\]\}\}/$myfiles}"
+ value="${value//\{tcp-port\}/$tcpport}"
+ value="${value//\{tcp-target\}/$tcptarget}"
+ value="${value//\{dbuser\}/$dbuser}"
+ value="${value//\{dbpassword\}/$dbpassword}"
+ value="${value//\{file\[\]\}/$myfiles}"
DBD_PARAMS[$mykey]="$value"
dbdetect._wd ">>> $mykey = $value"
diff --git a/plugins/localdump/profiles/couchdb2.ini b/plugins/localdump/profiles/couchdb2.ini
index b31a78b..6462a8c 100644
--- a/plugins/localdump/profiles/couchdb2.ini
+++ b/plugins/localdump/profiles/couchdb2.ini
@@ -18,6 +18,6 @@ dbuser = 'admin'
dbpassword = 'HereIsMyAdminPassword'
params = ''
-env = 'export COUCH_URL=http://{{dbuser}}:{{dbpassword}}@{{tcp-target}}:{{tcp-port}}/'
+env = 'export COUCH_URL=http://{dbuser}:{dbpassword}@{tcp-target}:{tcp-port}/'
# ----------------------------------------------------------------------
diff --git a/plugins/localdump/profiles/mysql_localhost_docker_13306.ini.example b/plugins/localdump/profiles/mysql_localhost_docker_13306.ini.example
index 7c9d906..3cabdc2 100644
--- a/plugins/localdump/profiles/mysql_localhost_docker_13306.ini.example
+++ b/plugins/localdump/profiles/mysql_localhost_docker_13306.ini.example
@@ -32,7 +32,7 @@ dbuser = 'root'
dbpassword = '12345678'
# unschön - das ist in der Prozessliste
-params = '--port={{tcp-port}} --password={{dbpassword}} --user={{dbuser}} --host={{tcp-target}}'
+params = '--port={tcp-port} --password={dbpassword} --user={dbuser} --host={tcp-target}'
# https://dev.mysql.com/doc/refman/8.0/en/environment-variables.html
env = ''
diff --git a/plugins/localdump/profiles/pgsql.ini b/plugins/localdump/profiles/pgsql.ini
index bbb24f6..09e79fe 100644
--- a/plugins/localdump/profiles/pgsql.ini
+++ b/plugins/localdump/profiles/pgsql.ini
@@ -26,7 +26,7 @@ dbpassword = ''
; -w, --no-password never prompt for password
; -W, --password force password prompt (should happen automatically)
;
-# params = '--host= {{tcp-target}} --port={{tcp-port}} --username={{dbuser}} --no-password'
+# params = '--host= {tcp-target} --port={tcp-port} --username={dbuser} --no-password'
# https://www.postgresql.org/docs/current/libpq-envars.html
diff --git a/plugins/localdump/profiles/pgsql_remote.ini.example b/plugins/localdump/profiles/pgsql_remote.ini.example
index 9249611..98b728a 100644
--- a/plugins/localdump/profiles/pgsql_remote.ini.example
+++ b/plugins/localdump/profiles/pgsql_remote.ini.example
@@ -19,7 +19,7 @@ su = ''
dbuser = 'mydbuser'
dbpassword = 'mypassword'
-params = '--host= {{tcp-target}} --port={{tcp-port}} --username={{dbuser}}'
+params = '--host= {tcp-target} --port={tcp-port} --username={dbuser}'
env = 'PGPASSWORD={{dbpassword}}'
# https://www.postgresql.org/docs/current/libpq-envars.html
diff --git a/plugins/localdump/profiles/readme.md b/plugins/localdump/profiles/readme.md
index 577cdbb..f6269be 100644
--- a/plugins/localdump/profiles/readme.md
+++ b/plugins/localdump/profiles/readme.md
@@ -64,12 +64,12 @@ If a profile detection was successful then values in the [set] section will be a
Replacements that can be used for values `params` and `env`:
-| Key | Description |
-|--- |--- |
-| {{dbpassword}} | value of [set] -> dbpassword
-| {{dbuser}} | value of [set] -> dbuser
-| {{tcp-port}} | value of [detect] -> tcp-port
-| {{tcp-target}} | value of [detect] -> tcp-target
+| Key | Description |
+|--- |--- |
+| {dbpassword} | value of [set] -> dbpassword
+| {dbuser} | value of [set] -> dbuser
+| {tcp-port} | value of [detect] -> tcp-port
+| {tcp-target} | value of [detect] -> tcp-target
```ini
[set]
@@ -77,7 +77,7 @@ Replacements that can be used for values `params` and `env`:
su = ''
dbuser = 'root'
dbpassword = '12345678'
-params = '--port={{tcp-port}} --password={{dbpassword}} --user={{dbuser}} --host={{tcp-target}}'
+params = '--port={tcp-port} --password={dbpassword} --user={dbuser} --host={tcp-target}'
env = 'export var1="happy meal"; export var2="new"; export var3="year!"'
--
GitLab