Very slight speedup on rc file parsing; use hostname variable in preference

to calling /bin/hostname if available

Approved by:	ale (maintainer)

5 files changed, 10 insertions, 5 deletions

diff --git a/databases/mysql41-server/files/mysql-server.in b/databases/mysql41-server/files/mysql-server.in
index 7d32b4390512..5052130ec4d7 100644
--- a/databases/mysql41-server/files/mysql-server.in
+++ b/databases/mysql41-server/files/mysql-server.in
@@ -33,7 +33,8 @@ load_rc_config $name
 
 mysql_user="mysql"
 mysql_limits_args="-e -U ${mysql_user}"
-pidfile="${mysql_dbdir}/`/bin/hostname`.pid"
+: ${hostname:=`/bin/hostname`}
+pidfile="${mysql_dbdir}/${hostname}.pid"
 command="%%PREFIX%%/bin/mysqld_safe"
 command_args="--defaults-extra-file=${mysql_dbdir}/my.cnf --user=${mysql_user} --datadir=${mysql_dbdir} --pid-file=${pidfile} ${mysql_args} > /dev/null 2>&1 &"
 procname="%%PREFIX%%/libexec/mysqld"
diff --git a/databases/mysql50-server/files/mysql-server.in b/databases/mysql50-server/files/mysql-server.in
index 0f09381c1242..020eed19d8c8 100644
--- a/databases/mysql50-server/files/mysql-server.in
+++ b/databases/mysql50-server/files/mysql-server.in
@@ -38,7 +38,8 @@ load_rc_config $name
 
 mysql_user="mysql"
 mysql_limits_args="-e -U ${mysql_user}"
-pidfile=${mysql_pidfile:-"${mysql_dbdir}/`/bin/hostname`.pid"}
+: ${hostname:=`/bin/hostname`}
+pidfile=${mysql_pidfile:-"${mysql_dbdir}/${hostname}.pid"}
 command="/usr/sbin/daemon"
 command_args="-c -f %%PREFIX%%/bin/mysqld_safe --defaults-extra-file=${mysql_dbdir}/my.cnf --user=${mysql_user} --datadir=${mysql_dbdir} --socket=${mysql_socket} --pid-file=${pidfile} ${mysql_args}"
 procname="%%PREFIX%%/libexec/mysqld"
diff --git a/databases/mysql51-server/files/mysql-server.in b/databases/mysql51-server/files/mysql-server.in
index 14104b1cbba4..40d797e3acb0 100644
--- a/databases/mysql51-server/files/mysql-server.in
+++ b/databases/mysql51-server/files/mysql-server.in
@@ -35,7 +35,8 @@ load_rc_config $name
 
 mysql_user="mysql"
 mysql_limits_args="-e -U ${mysql_user}"
-pidfile=${mysql_pidfile:-"${mysql_dbdir}/`/bin/hostname`.pid"}
+: ${hostname:=`/bin/hostname`}
+pidfile=${mysql_pidfile:-"${mysql_dbdir}/${hostname}.pid"}
 command="/usr/sbin/daemon"
 command_args="-c -f %%PREFIX%%/bin/mysqld_safe --defaults-extra-file=${mysql_dbdir}/my.cnf --user=${mysql_user} --datadir=${mysql_dbdir} --pid-file=${pidfile} ${mysql_args}"
 procname="%%PREFIX%%/libexec/mysqld"
diff --git a/databases/mysql55-server/files/mysql-server.in b/databases/mysql55-server/files/mysql-server.in
index 5eeb978225b4..d2cdc080e216 100644
--- a/databases/mysql55-server/files/mysql-server.in
+++ b/databases/mysql55-server/files/mysql-server.in
@@ -38,7 +38,8 @@ load_rc_config $name
 
 mysql_user="mysql"
 mysql_limits_args="-e -U ${mysql_user}"
-pidfile=${mysql_pidfile:-"${mysql_dbdir}/`/bin/hostname`.pid"}
+: ${hostname:=`/bin/hostname`}
+pidfile=${mysql_pidfile:-"${mysql_dbdir}/${hostname}.pid"}
 command="/usr/sbin/daemon"
 command_args="-c -f %%PREFIX%%/bin/mysqld_safe --defaults-extra-file=${mysql_optfile} --user=${mysql_user} --datadir=${mysql_dbdir} --pid-file=${pidfile} ${mysql_args}"
 procname="%%PREFIX%%/libexec/mysqld"
diff --git a/databases/mysql56-server/files/mysql-server.in b/databases/mysql56-server/files/mysql-server.in
index 5eeb978225b4..d2cdc080e216 100644
--- a/databases/mysql56-server/files/mysql-server.in
+++ b/databases/mysql56-server/files/mysql-server.in
@@ -38,7 +38,8 @@ load_rc_config $name
 
 mysql_user="mysql"
 mysql_limits_args="-e -U ${mysql_user}"
-pidfile=${mysql_pidfile:-"${mysql_dbdir}/`/bin/hostname`.pid"}
+: ${hostname:=`/bin/hostname`}
+pidfile=${mysql_pidfile:-"${mysql_dbdir}/${hostname}.pid"}
 command="/usr/sbin/daemon"
 command_args="-c -f %%PREFIX%%/bin/mysqld_safe --defaults-extra-file=${mysql_optfile} --user=${mysql_user} --datadir=${mysql_dbdir} --pid-file=${pidfile} ${mysql_args}"
 procname="%%PREFIX%%/libexec/mysqld"