Code formatting improvements

plugins/client/apt/scripts/apt

@@ -1,8 +1,11 @@
 #!/bin/sh
 
+# {{{ Variables
 TARGETS='updates security backports'
 TARGET=
+# }}}
 
+# {{{ usage()
 usage() {
 cat <<EOH
 USAGE: $(basename "$0") [OPTIONS]
@@ -14,7 +17,9 @@ Options:
     -t  Target ($(echo "${TARGETS}" | sed 's/ / or /g'))
 EOH
 }
+# }}}
 
+# {{{ main()
 while getopts "ht:" OPT ; do
     case "$OPT" in 
         h)
@@ -54,3 +59,6 @@ case "${TARGET}" in
 esac
 
 exit 0
+# }}}
+
+# vim: foldmethod=marker foldlevel=0 foldenable

plugins/client/checkrestart/scripts/checkrestart

@@ -1,7 +1,11 @@
 #!/bin/sh
 
+# {{{ main()
 export LANG=C
 
 checkrestart 2>/dev/null| head -n 1 | sed -r 's/^Found ([0-9]+) processes using old versions of upgraded files$/\1/'
 
 exit 0
+# }}}
+
+# vim: foldmethod=marker foldlevel=0 foldenable

plugins/client/nginx/scripts/nginx-status

@@ -1,11 +1,13 @@
 #!/bin/sh
 
+# {{{ Variables
 URL=""
 INFO=""
 CRAWLER=""
-
 INFOS="active accepted handled requests reading writing waiting"
+# }}}
 
+# {{{ usage()
 usage() {
 cat <<EOH
 USAGE: $(basename "$0") -u URL -i STATUS_INFO
@@ -17,7 +19,9 @@ Options:
     -i  Status info in $(echo "${INFOS}" | sed 's/ /, /g')
 EOH
 }
+# }}}
 
+# {{{ main()
 while getopts "u:i:" OPT ; do
     case "$OPT" in 
         \?|h)
@@ -82,3 +86,6 @@ case "${INFO}" in
 esac
 
 exit 0
+# }}}
+
+# vim: foldmethod=marker foldlevel=0 foldenable

plugins/client/utils/scripts/yaml2json

@@ -16,7 +16,7 @@ _DESC = "Convert yaml data to zabbix json discovery format"
 _VERSION = "0.1"
 # }}}
 
-# {{{ main
+# {{{ main()
 def main():
     parser = argparse.ArgumentParser(prog=_NAME, description=_DESC)
     parser.add_argument('-v', '--version', action='version',

plugins/server/icmp-checker/scripts/icmp-checker

@@ -1,14 +1,16 @@
 #!/bin/sh
 
+# {{{ Variables
 ZBX_SERVER_ADDR="127.0.0.1"
 ZBX_SERVER_PORT="10051"
-
 HOST_IP="${1}"
 HOST_NAME="${2}"
 PING_COUNT="${3}"
 PING_INTERVAL="${4}"
 NOFORK="${5}"
+# }}}
 
+# {{{ main()
 if [ $# -lt 4 ]; then
     printf "Wrong parameter count\n" >&2
     printf "Usage: $(basename "${0}") <HOST_IP> <ZABBIX_HOST_NAME> <NUMBERS_OF_PING_REQUESTS> <INTERVAL> [<NOFORK>]\n" >&2
@@ -43,4 +45,8 @@ EOC
 fi
 
 echo 1
+
 exit 0
+# }}}
+
+# vim: foldmethod=marker foldlevel=0 foldenable

plugins/server/ssl/scripts/ssl

@@ -1,9 +1,12 @@
 #!/bin/sh
 
+# {{{ Variables
 RESULT=1
 CAPATH="/etc/ssl/certs"
 DATE_CHECK=0
+# }}}
 
+# {{{ usage()
 usage() {
 cat <<EOH
 USAGE: $(basename "$0") [-t] -u URI
@@ -26,7 +29,9 @@ Return:
   print the certificate expiration interval in days (only with option -t)
 EOH
 }
+# }}}
 
+# {{{ main()
 while getopts htu: option ; do
     case "${option}" in
         h)
@@ -90,6 +95,9 @@ fi
 
 rm -f "${certs_data}" "${errors_log}"
 
-printf "${RESULT}\n"
+printf -- "${RESULT}\n"
 
 exit 0
+# }}}
+
+# vim: foldmethod=marker foldlevel=0 foldenable

plugins/server/ssl/scripts/ssl-expiration

@@ -1,5 +1,9 @@
 #!/bin/sh
 
+# {{{ main()
 $(dirname "$(readlink -f "${0}")")/ssl -t -u "${1}"
 
 exit 0
+# }}}
+
+# vim: foldmethod=marker foldlevel=0 foldenable

plugins/server/ssl/scripts/ssl-validity

@@ -1,5 +1,9 @@
 #!/bin/sh
 
+# {{{ main()
 $(dirname "$(readlink -f "${0}")")/ssl -u "${1}"
 
 exit 0
+# }}}
+
+# vim: foldmethod=marker foldlevel=0 foldenable