[gentoo-commits] gentoo-x86 commit in app-admin/logstash-forwarder/files: logstash-forwarder.initd

[Amadeusz Zolnowski (aidecoe)]

aidecoe     15/03/21 15:14:41

  Modified:             logstash-forwarder.initd
  Log:
  Make variables names consistent.
  
  (Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key 
F0134531E1DBFAB5)

Revision  Changes    Path
1.3                  app-admin/logstash-forwarder/files/logstash-forwarder.initd

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/logstash-forwarder/files/logstash-forwarder.initd?rev=1.3&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/logstash-forwarder/files/logstash-forwarder.initd?rev=1.3&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/logstash-forwarder/files/logstash-forwarder.initd?r1=1.2&r2=1.3

Index: logstash-forwarder.initd
===================================================================
RCS file: 
/var/cvsroot/gentoo-x86/app-admin/logstash-forwarder/files/logstash-forwarder.initd,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- logstash-forwarder.initd    20 Mar 2015 19:43:26 -0000      1.2
+++ logstash-forwarder.initd    21 Mar 2015 15:14:41 -0000      1.3
@@ -1,15 +1,15 @@
 #!/sbin/runscript
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: 
/var/cvsroot/gentoo-x86/app-admin/logstash-forwarder/files/logstash-forwarder.initd,v
 1.2 2015/03/20 19:43:26 aidecoe Exp $
+# $Header: 
/var/cvsroot/gentoo-x86/app-admin/logstash-forwarder/files/logstash-forwarder.initd,v
 1.3 2015/03/21 15:14:41 aidecoe Exp $
 
 create_tmpdir() {
        local tmpdir="$(mktemp -d -p /tmp logstash-forwarder.XXXXXXXXXX)"
 
-       chown logstash:logstash "$tmpdir" || return 1
-       chmod 0750 "$tmpdir" || return 1
+       chown logstash:logstash "${tmpdir}" || return 1
+       chmod 0750 "${tmpdir}" || return 1
 
-       echo "$tmpdir"
+       echo "${tmpdir}"
 }
 
 remove_tmpdir() {
@@ -17,25 +17,25 @@
        local tmpdir=''
 
        for d in /tmp/logstash-forwarder.??????????; do
-               [[ -e $d ]] || return 0
-               [[ -d $d ]] || continue
+               [[ -e ${d} ]] || return 0
+               [[ -d ${d} ]] || continue
 
-               if ! [[ $tmpdir ]]; then
-                       tmpdir="$d"
+               if ! [[ ${tmpdir} ]]; then
+                       tmpdir="${d}"
                else
                        # There are more directories like that, so better keep 
them all.
                        return 1
                fi
        done
 
-       rm -r "$tmpdir"
+       rm -r "${tmpdir}"
 }
 
 start() {
        local config_file=/etc/logstash-forwarder/logstash-forwarder.conf
        local tmpdir="$(create_tmpdir)"
 
-       if ! [[ -d $tmpdir ]]; then
+       if ! [[ -d ${tmpdir} ]]; then
                eend 1 "Failed to create tmp directory for logstash-forwarder"
                return 1
        fi
@@ -43,7 +43,7 @@
        ebegin "Starting logstash-forwarder"
        start-stop-daemon --start --exec /usr/bin/logstash-forwarder \
                --make-pidfile --pidfile /run/logstash-forwarder.pid \
-               --background --wait 100 --chdir "$tmpdir" \
+               --background --wait 100 --chdir "${tmpdir}" \
                --user logstash --group logstash \
                -- -config="${config_file}" ${LOGSTASH_FORWARDER_ARGS}
        eend $?
@@ -59,5 +59,5 @@
                ewarn "Failed to remove logstash-forwarder tmp directory"
        fi
 
-       eend $rc
+       eend ${rc}
 }