[gentoo-commits] repo/gentoo:master commit in: dev-db/influxdb/files/

[Robin H. Johnson]

commit:     4bdbbfae0e5bb38d32a86f43b7a2c2cd57c70dfe
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 15 21:02:50 2020 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Wed Jul 15 21:30:46 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4bdbbfae

dev-db/influxdb: cleanup new init script

Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>

 dev-db/influxdb/files/influxdb.rc-r1 | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/dev-db/influxdb/files/influxdb.rc-r1 
b/dev-db/influxdb/files/influxdb.rc-r1
index 28fd9f6861c..7556a506784 100644
--- a/dev-db/influxdb/files/influxdb.rc-r1
+++ b/dev-db/influxdb/files/influxdb.rc-r1
@@ -1,6 +1,8 @@
 #!/sbin/openrc-run
 
 config="${config:-/etc/influxdb/influxdb.conf}"
+pidfile=${pidfile:-/var/run/influxd.pid}
+influxd_opts=${influxd_opts:-}
 
 supervisor="supervise-daemon"
 command=/usr/bin/influxd
@@ -19,20 +21,20 @@ rc_ulimit="-n 65536"
 
 start_pre() {
        # Check if config file exist
-       if [ ! -r ${config} ]; then
+       if [ ! -r "${config}" ]; then
                eerror "config file ${config} doesn't exist"
            return 1
        fi
-       if [ ! -f "$error_log" ]; then
-               mkdir -p "$(dirname $error_log)"
+       if [ -n "${error_log}" ] && [ ! -e "${error_log}" ]; then
+               checkpath -d -o "${command_user}" "$(dirname "${error_log}")"
        fi
-       if [ ! -f "$output_log" ]; then
-               mkdir -p "$(dirname $output_log)"
+       if [ -n "${output_log}" ] && [ ! -e "${output_log}" ]; then
+               checkpath -d -o "${command_user}" "$(dirname "${output_log}")"
        fi
        return 0
 }
 
-if [[ -n "${INFLUXDB_HEALTHCHECK_URI}" ]]; then
+if [ -n "${INFLUXDB_HEALTHCHECK_URI}" ]; then
         healthcheck_delay=300
         healthcheck_timer=60