aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2011-11-28 16:15:03 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2011-11-28 16:28:01 +0200
commit140476391c2dd2982a0b0560e5960de8b7231fb1 (patch)
treefdd01637d40c8fd8e2fe60ffd789493705123f0a
parent00a3409902646f8c8576ec06eb26243c9cf629f1 (diff)
Clear shell variables before appending
-rwxr-xr-xbuild/mysql/mysql3
-rwxr-xr-xbuild/oracle/oracle9
-rwxr-xr-xbuild/pgsql/pgsql3
-rw-r--r--m4/mysql.m42
-rw-r--r--m4/oracle.m42
-rw-r--r--m4/pgsql.m42
6 files changed, 20 insertions, 1 deletions
diff --git a/build/mysql/mysql b/build/mysql/mysql
index a6800a0..e91da92 100755
--- a/build/mysql/mysql
+++ b/build/mysql/mysql
@@ -9,6 +9,9 @@
# MySQL driver wrapper.
#
+opt=
+driver=
+
while [ $# -gt 0 ]; do
case $1 in
--driver)
diff --git a/build/oracle/oracle b/build/oracle/oracle
index 4d518fe..e3030d6 100755
--- a/build/oracle/oracle
+++ b/build/oracle/oracle
@@ -9,6 +9,13 @@
# Oracle driver wrapper.
#
+driver=
+user=
+passwd=
+service=
+host=
+port=
+
while [ $# -gt 0 ]; do
case $1 in
--driver)
@@ -65,7 +72,7 @@ elif [ -n "$service" ]; then
conn="$conn@$service"
fi
-opt="-L $opt"
+opt="-L"
if [ -n "$1" ]; then
opt="-S $opt"
diff --git a/build/pgsql/pgsql b/build/pgsql/pgsql
index c1c2482..0f92871 100755
--- a/build/pgsql/pgsql
+++ b/build/pgsql/pgsql
@@ -9,6 +9,9 @@
# PostgreSQL driver wrapper.
#
+driver=
+opt=
+
while [ $# -gt 0 ]; do
case $1 in
--driver)
diff --git a/m4/mysql.m4 b/m4/mysql.m4
index 102f150..a93efe6 100644
--- a/m4/mysql.m4
+++ b/m4/mysql.m4
@@ -207,6 +207,8 @@ AC_CONFIG_COMMANDS([mysql.options],
rm -f db.options
echo '#! /bin/sh' >db-driver
+ echo 'opt=' >>db-driver
+
if test x$mysql_user_set = xyes; then
echo "--user '$mysql_user'" >>db.options
echo 'opt="$opt --user='"$mysql_user"'"' >>db-driver
diff --git a/m4/oracle.m4 b/m4/oracle.m4
index bf192e4..24e2724 100644
--- a/m4/oracle.m4
+++ b/m4/oracle.m4
@@ -184,6 +184,8 @@ AC_CONFIG_COMMANDS([oracle.options],
rm -f db.options
echo '#! /bin/sh' >db-driver
+ echo 'conn_str=' >>db-driver
+
if test x$oracle_user_set = xyes; then
echo "--user '$oracle_user'" >>db.options
echo 'conn_str="'"$oracle_user"'"' >>db-driver
diff --git a/m4/pgsql.m4 b/m4/pgsql.m4
index a75a95e..b38bf34 100644
--- a/m4/pgsql.m4
+++ b/m4/pgsql.m4
@@ -153,6 +153,8 @@ AC_CONFIG_COMMANDS([pgsql.options],
rm -f db.options
echo '#! /bin/sh' >db-driver
+ echo 'opt=' >>db-driver
+
if test x$pgsql_user_set = xyes; then
echo "--username '$pgsql_user'" >>db.options
echo 'opt="$opt --username='"$pgsql_user"'"' >>db-driver