summaryrefslogtreecommitdiff
path: root/databases
diff options
context:
space:
mode:
authorDoug Barton <dougb@FreeBSD.org>2011-05-15 02:49:17 +0000
committerDoug Barton <dougb@FreeBSD.org>2011-05-15 02:49:17 +0000
commit29813d539747e58a6e3322df3f48eae4338c60b5 (patch)
treead64253796dc7d189145d9bb72dbd175c35488f4 /databases
parent-Update to 2.0.0b4.p7 (diff)
Remove painful examples of foo="", with particular prejudice against
constructions that parse out to [ -z "$foo" ] && foo="" These are bad examples that get copied and pasted into new code, so the hope is that with less bad examples there will be less need for me to bring this up in review. In a few of these files all that were changed were comments so that next time I search for these patterns I won't trip on the file for no reason. In a few places, add $FreeBSD$ No functional changes, so no PORTREVISION bumps
Notes
Notes: svn path=/head/; revision=274133
Diffstat (limited to 'databases')
-rw-r--r--databases/cego/files/cego.in1
-rw-r--r--databases/couchdb/files/couchdb.in1
-rw-r--r--databases/drizzle/files/drizzle-server.sh.in1
-rw-r--r--databases/mariadb-client/files/mysql-server.in1
-rw-r--r--databases/mariadb-scripts/files/mysql-server.in1
-rw-r--r--databases/mariadb-server/files/mysql-server.in1
-rw-r--r--databases/mariadb/files/mysql-server.in1
-rw-r--r--databases/mysql-proxy/files/mysql-proxy.in2
-rw-r--r--databases/mysql323-server/files/mysql-server.sh.in1
-rw-r--r--databases/mysql40-server/files/mysql-server.sh.in1
-rw-r--r--databases/mysql41-server/files/mysql-server.sh.in1
-rw-r--r--databases/redis/files/redis.sh.in1
-rw-r--r--databases/slony1/files/slon.sh.in1
-rw-r--r--databases/slony1v2/files/slon.sh.in1
14 files changed, 1 insertions, 14 deletions
diff --git a/databases/cego/files/cego.in b/databases/cego/files/cego.in
index 737d8650ca51..c4b09cf1c1d3 100644
--- a/databases/cego/files/cego.in
+++ b/databases/cego/files/cego.in
@@ -27,7 +27,6 @@ command="%%PREFIX%%/bin/cego"
: ${cego_enable="NO"}
: ${cego_conf="%%PREFIX%%/cego"}
: ${cego_root="%%PREFIX%%/cego"}
-: ${cego_tablespc=""}
: ${cego_user="%%USER%%"}
flags="--mode=daemon"
diff --git a/databases/couchdb/files/couchdb.in b/databases/couchdb/files/couchdb.in
index dea224b7c36d..31ba39bd69a2 100644
--- a/databases/couchdb/files/couchdb.in
+++ b/databases/couchdb/files/couchdb.in
@@ -33,7 +33,6 @@ load_rc_config $name
command="%%PREFIX%%/bin/${name}"
pidfile="/var/run/${name}/${name}.pid"
etcdir="%%PREFIX%%/etc/${name}"
-respawn=""
if [ "$couchdb_respawn" -gt 0 ]
then
diff --git a/databases/drizzle/files/drizzle-server.sh.in b/databases/drizzle/files/drizzle-server.sh.in
index 04ab20aeae6c..aeeedef74ede 100644
--- a/databases/drizzle/files/drizzle-server.sh.in
+++ b/databases/drizzle/files/drizzle-server.sh.in
@@ -34,7 +34,6 @@ load_rc_config $name
: ${drizzle_limits="NO"}
: ${drizzle_dbdir="/var/db/drizzle"}
: ${drizzle_log="${drizzle_dbdir}/`/bin/hostname`.log"}
-: ${drizzle_args=""}
drizzle_user="%%USERS%%"
drizzle_limits_args="-e -U ${drizzle_user}"
diff --git a/databases/mariadb-client/files/mysql-server.in b/databases/mariadb-client/files/mysql-server.in
index eb7abb96fee3..37af2233ad55 100644
--- a/databases/mariadb-client/files/mysql-server.in
+++ b/databases/mariadb-client/files/mysql-server.in
@@ -30,7 +30,6 @@ load_rc_config $name
: ${mysql_enable="NO"}
: ${mysql_limits="NO"}
: ${mysql_dbdir="/var/db/mysql"}
-: ${mysql_args=""}
mysql_user="mysql"
mysql_limits_args="-e -U ${mysql_user}"
diff --git a/databases/mariadb-scripts/files/mysql-server.in b/databases/mariadb-scripts/files/mysql-server.in
index eb7abb96fee3..37af2233ad55 100644
--- a/databases/mariadb-scripts/files/mysql-server.in
+++ b/databases/mariadb-scripts/files/mysql-server.in
@@ -30,7 +30,6 @@ load_rc_config $name
: ${mysql_enable="NO"}
: ${mysql_limits="NO"}
: ${mysql_dbdir="/var/db/mysql"}
-: ${mysql_args=""}
mysql_user="mysql"
mysql_limits_args="-e -U ${mysql_user}"
diff --git a/databases/mariadb-server/files/mysql-server.in b/databases/mariadb-server/files/mysql-server.in
index eb7abb96fee3..37af2233ad55 100644
--- a/databases/mariadb-server/files/mysql-server.in
+++ b/databases/mariadb-server/files/mysql-server.in
@@ -30,7 +30,6 @@ load_rc_config $name
: ${mysql_enable="NO"}
: ${mysql_limits="NO"}
: ${mysql_dbdir="/var/db/mysql"}
-: ${mysql_args=""}
mysql_user="mysql"
mysql_limits_args="-e -U ${mysql_user}"
diff --git a/databases/mariadb/files/mysql-server.in b/databases/mariadb/files/mysql-server.in
index eb7abb96fee3..37af2233ad55 100644
--- a/databases/mariadb/files/mysql-server.in
+++ b/databases/mariadb/files/mysql-server.in
@@ -30,7 +30,6 @@ load_rc_config $name
: ${mysql_enable="NO"}
: ${mysql_limits="NO"}
: ${mysql_dbdir="/var/db/mysql"}
-: ${mysql_args=""}
mysql_user="mysql"
mysql_limits_args="-e -U ${mysql_user}"
diff --git a/databases/mysql-proxy/files/mysql-proxy.in b/databases/mysql-proxy/files/mysql-proxy.in
index 79704eb9ddf5..0d904ab5d325 100644
--- a/databases/mysql-proxy/files/mysql-proxy.in
+++ b/databases/mysql-proxy/files/mysql-proxy.in
@@ -39,7 +39,7 @@ load_rc_config $name
: ${mysql_proxy_address=":4040"}
: ${mysql_proxy_backend_addresses="127.0.0.1:3306"}
: ${mysql_proxy_pid_file="/var/run/mysql-proxy.pid"}
-proxy_backend_addresses=""
+
for addr in ${mysql_proxy_backend_addresses}; do
proxy_backend_addresses="${proxy_backend_addresses} --proxy-backend-addresses=${addr}"
done
diff --git a/databases/mysql323-server/files/mysql-server.sh.in b/databases/mysql323-server/files/mysql-server.sh.in
index fbb17f8f0eac..e1e46e89ac82 100644
--- a/databases/mysql323-server/files/mysql-server.sh.in
+++ b/databases/mysql323-server/files/mysql-server.sh.in
@@ -30,7 +30,6 @@ load_rc_config $name
: ${mysql_enable="NO"}
: ${mysql_limits="NO"}
: ${mysql_dbdir="/var/db/mysql"}
-: ${mysql_args=""}
mysql_user="mysql"
mysql_limits_args="-e -U ${mysql_user}"
diff --git a/databases/mysql40-server/files/mysql-server.sh.in b/databases/mysql40-server/files/mysql-server.sh.in
index d99e529a683f..e9c52657df91 100644
--- a/databases/mysql40-server/files/mysql-server.sh.in
+++ b/databases/mysql40-server/files/mysql-server.sh.in
@@ -30,7 +30,6 @@ load_rc_config $name
: ${mysql_enable="NO"}
: ${mysql_limits="NO"}
: ${mysql_dbdir="/var/db/mysql"}
-: ${mysql_args=""}
mysql_user="mysql"
mysql_limits_args="-e -U ${mysql_user}"
diff --git a/databases/mysql41-server/files/mysql-server.sh.in b/databases/mysql41-server/files/mysql-server.sh.in
index a7b8858ad15c..14842477ea12 100644
--- a/databases/mysql41-server/files/mysql-server.sh.in
+++ b/databases/mysql41-server/files/mysql-server.sh.in
@@ -30,7 +30,6 @@ load_rc_config $name
: ${mysql_enable="NO"}
: ${mysql_limits="NO"}
: ${mysql_dbdir="/var/db/mysql"}
-: ${mysql_args=""}
mysql_user="mysql"
mysql_limits_args="-e -U ${mysql_user}"
diff --git a/databases/redis/files/redis.sh.in b/databases/redis/files/redis.sh.in
index 30d006b15c54..0e232f79f251 100644
--- a/databases/redis/files/redis.sh.in
+++ b/databases/redis/files/redis.sh.in
@@ -30,6 +30,5 @@ required_files="${config_file}"
load_rc_config "$name"
: ${redis_enable="NO"}
: ${redis_user="%%REDIS_USER%%"}
-: ${redis_flags=""}
run_rc_command "$1"
diff --git a/databases/slony1/files/slon.sh.in b/databases/slony1/files/slon.sh.in
index 4557a70dd88a..c2f1113f2e49 100644
--- a/databases/slony1/files/slon.sh.in
+++ b/databases/slony1/files/slon.sh.in
@@ -24,7 +24,6 @@ procname="%%PREFIX%%/bin/slon"
# From global rc.conf(5); if unset, set them here
[ -z "$slon_enable" ] && slon_enable="NO"
-[ -z "$slon_profiles" ] && slon_profiles=""
configfile_path="%%PREFIX%%/etc/${name}.conf"
command_args="-f ${configfile_path}"
diff --git a/databases/slony1v2/files/slon.sh.in b/databases/slony1v2/files/slon.sh.in
index 4557a70dd88a..c2f1113f2e49 100644
--- a/databases/slony1v2/files/slon.sh.in
+++ b/databases/slony1v2/files/slon.sh.in
@@ -24,7 +24,6 @@ procname="%%PREFIX%%/bin/slon"
# From global rc.conf(5); if unset, set them here
[ -z "$slon_enable" ] && slon_enable="NO"
-[ -z "$slon_profiles" ] && slon_profiles=""
configfile_path="%%PREFIX%%/etc/${name}.conf"
command_args="-f ${configfile_path}"