From 531d0f6f431f31172559d55bf04c122a7b6e6c3e Mon Sep 17 00:00:00 2001 From: =?utf8?q?Amadeusz=20=C5=BBo=C5=82nowski?= Date: Sat, 21 Mar 2015 15:14:46 +0000 Subject: [PATCH] Make variables names consistent. Package-Manager: portage-2.2.18/cvs/Linux x86_64 Manifest-Sign-Key: 0xF0134531E1DBFAB5 --- app-admin/logstash-forwarder/ChangeLog | 6 ++++- app-admin/logstash-forwarder/Manifest | 18 +++++++------- .../files/logstash-forwarder.initd | 24 +++++++++---------- 3 files changed, 26 insertions(+), 22 deletions(-) diff --git a/app-admin/logstash-forwarder/ChangeLog b/app-admin/logstash-forwarder/ChangeLog index 40f99349bd2a..a54c8ab35a5a 100644 --- a/app-admin/logstash-forwarder/ChangeLog +++ b/app-admin/logstash-forwarder/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-admin/logstash-forwarder # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/logstash-forwarder/ChangeLog,v 1.2 2015/03/20 19:43:25 aidecoe Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/logstash-forwarder/ChangeLog,v 1.3 2015/03/21 15:14:40 aidecoe Exp $ + + 21 Mar 2015; Amadeusz Żołnowski + files/logstash-forwarder.initd: + Make variables names consistent. 20 Mar 2015; Amadeusz Żołnowski files/logstash-forwarder.initd: diff --git a/app-admin/logstash-forwarder/Manifest b/app-admin/logstash-forwarder/Manifest index 43090e022ea7..a8e2e527ad9d 100644 --- a/app-admin/logstash-forwarder/Manifest +++ b/app-admin/logstash-forwarder/Manifest @@ -2,19 +2,19 @@ Hash: SHA256 AUX logstash-forwarder.confd 46 SHA256 9facaebb72117a4ac2e24dbc8699c46cde41f579e58ad4da449745502f44a65f SHA512 fc74aa79b03eef36640324477d56988d5e180c865beda1b0b09c4e72f8dfc3fe9f8b0339713680108ff7b34cc666d309506ea5b1b43ffd13dbfcc0ed742fc769 WHIRLPOOL f3ed7420fc5849338a8273907cb3c0c9dba3029b2c2a0b3012f88b3f839aea7849384164866c4953c995e7bdbb1b05dc3f4923556da92f4c77f2f05090ae8f18 -AUX logstash-forwarder.initd 1591 SHA256 e851a728b8cb489d0a84c85e6e3b5df0f7b37229245e8796c6b7f1889bde3029 SHA512 3c67b8d0f5c245bd1aeb861939e79c1bd105d2db2a73a7e69e413a5cd68b4c4d70a60771bcbabb01ef6bbc26df1856b20aca5331f870981007498c72a795af2b WHIRLPOOL b72920d568ded63d0305b9eab7aca1c3a16793276bacf5182128975862f1c927410b5e17e5d8565fef537034fd58f3a21b8303efc675dcb419bc38bf27b6fcee +AUX logstash-forwarder.initd 1613 SHA256 7368caa9aea003b0348fcee5ae210a23f18f77602694fa4e464f52e306dfb615 SHA512 0ad39e4555113e15f5b77f12d50724c196efeb2fbb2f3208c49f51260de8c50f5626bc2718106f281cc439306e1c1f2fb178820f665c2f88076dc4382b1f11ce WHIRLPOOL 05c405e573508e340a12919b3d45fed41411f8c7bd6f6e7b9813653f9c8774b12db49fa636c954e67415d1225e3120ce25e9c001e8a5f8beea3ae62d22878c1a DIST logstash-forwarder-0.4.0.tar.gz 35189 SHA256 d930cd33747b2826c7358238a25e690324751d1b098e7c00de1357944766b3c3 SHA512 1f89b065d1b26a6f5b18da6215bdaed5a312af12fa721835f5e1a77248dd67f398f5af08b5d93c0c4c5ef9623eb1ddb58449b52039c0db0241d5ca61872102ef WHIRLPOOL 7715c723f8b8712b5cccc1e678017b2d733f243ea936d312ab31938fba73934a66d552656516bc72b65a3541945401f99463d8346fdf6a00372e9b3a0ed67655 EBUILD logstash-forwarder-0.4.0.ebuild 1243 SHA256 ef0611685f557a42d66a3f00042111c16bc09d009db5f8b3889db772e2877c96 SHA512 36b10a7e987a068aa3af3aabdf8d40b426f6814660cb9fe791568a0605d212e1489542b70465406148f651b601e5e0b4393c8210724a6f136bfd2f8532af921d WHIRLPOOL c1d0aac1b3a70de3ff5ac9abbc6ae3b62673808979e9905b75b62cefffb873d6ff4eb40a753667fefe6cd9ed39e6380acaca4c6b0a312a1a170b27dfdb45fa0c -MISC ChangeLog 645 SHA256 52a2938382b5c0fcfa1492074496b1db27bd5de480299488256811e0f529bc7d SHA512 e024ff70529ad0bf29fd8fd7ab3a55e1b224b590d140de5f0783f925cd66a81e8b81d2a785fdcec0a1798d3e6d0ebe6b2ae2bb76c2b725ef43a2eb7cfbba27a4 WHIRLPOOL 3f03324672c6f7731b6fd4df4204ff5ba9b710268df41651d7ff63781f73414765de0c1359f15a31b38cee27f104935cf0343e3139c5c5da8721c1a42f00d2b3 +MISC ChangeLog 772 SHA256 10c9a5025126f6154d42f6730bf68de8edcfefab98ff3a5de5b2367afa34d23f SHA512 ef56b5f8b8d4e85ae8d5aec9027b42729e512f043694d2cdbc9935f04551b58d3d5c9167bb525e4f0742c7a4ddb0c5560372926490c1805535f554207134029c WHIRLPOOL 0446d96e6c45c0d6cd7b5d7f75487a1b96b3de38b1253d716960e3c145be661a70caea7941d4ca44dafcc45fe46d39fb01ec84db5e8382e3c3d23f3fea28357a MISC metadata.xml 603 SHA256 afa09b7a5d2ccf7611d9bd5ee329ba209bd0f821ad64f8a68fa9d2e32a4e3fd6 SHA512 430670391f408196e00a8315a174476d3751363d4626dd1288f01b47bfb2483a3afbe90036dff082714fd03654dea69a49b9110d333b937c37b697aaffa703b3 WHIRLPOOL 27e1449eb094410b5733351ce21d56c31f5a7251fe2aa8623bf217532e8b35bb764af82a062110a401b64854a534b0ee25c2795571a7c81294a7dd932841f1e2 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iQEcBAEBCAAGBQJVDHhfAAoJEPATRTHh2/q1kEUH/j92eN33EN/iz8X/CBNfuMw+ -j5qDN9yWeBM209eHHYw4nqSoz1zYVryHVMNHqVw6XKNgXTJLiMsTYExt0+67VuyS -gzZ1q+Q/8MVKnWcU5uIlBcdJibApvL9T3Li/L73vJ3mwuhDDAfaNYnI1NwX71z7/ -dnd7YTHAtMB0m/9XNWyGMELWw9VAcde87cn4ztaqvSHfoc2vDmsidcginjs7+421 -sjQfcCSmc37jxG8au3Vycvlo1HFzgNfiaP7lJMKFZLb2hwx6Vas88GfSf1gmUKuz -iwMCT24MgHS+uYoD2VwlheETuHzzRdM82NYiGqNyJuPPn/NYUyo529ReKVHTL2c= -=+US/ +iQEcBAEBCAAGBQJVDYriAAoJEPATRTHh2/q1c1oIAIKdAqcdsSDzAzt7oLDJSpiF +O7MFtLI6HzMwvzmq46u9HNfB14+s/r9GuLl8Ao/51s0V4Xm1EGChTfDKz4dZciVB ++jNxDHjS6b9KOlWLGX/rTVtKFdIcJ4yTqS578XSVdaUVLls4YDSVpVLoMVrkOV9W +7lkYWzMRy15qn5KPfEKBAcdoPgJHRKEKLOEmR37lOtmfDUHKttFITPdrXlaM1B3q +exNyETco/fAs58g88hVqH/xikgNEGye5kVtreKzLHg+rZ1Wp0y4i5cXYMWjsL1SY +DVQPoi1aZ6aVs7yrGNX3Ci9D1rs6Dq91AFsl9m/VSUN2zSapEcOOSiLkvS2rfLQ= +=lsAt -----END PGP SIGNATURE----- diff --git a/app-admin/logstash-forwarder/files/logstash-forwarder.initd b/app-admin/logstash-forwarder/files/logstash-forwarder.initd index 906be4019f7d..d2ff0e2eece9 100644 --- a/app-admin/logstash-forwarder/files/logstash-forwarder.initd +++ b/app-admin/logstash-forwarder/files/logstash-forwarder.initd @@ -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 @@ remove_tmpdir() { 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 @@ start() { 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 @@ stop() { ewarn "Failed to remove logstash-forwarder tmp directory" fi - eend $rc + eend ${rc} } -- 2.26.2