X-Git-Url: https://git.grml.org/?a=blobdiff_plain;f=etc%2Fgrml%2Flsb-functions;h=78ca22e336d0cd17d6a08654cc4ff9e7d3e4144b;hb=bf6aac3d15e15c4d0785fa0ee0aa1da7856fa292;hp=22dc9e01d9b497d3244290d3afb90bb45f1e5158;hpb=8127b16eb88ea80058b009866a19408e22685aac;p=grml-etc-core.git

diff --git a/etc/grml/lsb-functions b/etc/grml/lsb-functions
index 22dc9e0..78ca22e 100644
--- a/etc/grml/lsb-functions
+++ b/etc/grml/lsb-functions
@@ -191,9 +191,9 @@ profiling() {
 #    parameters.
 #
 get_bootconfig() {
-    local copt=
-    local newbootlevel=
-    local newsoftlevel=
+    local copt
+    local newbootlevel
+    local newsoftlevel
 
     for copt in $(</proc/cmdline) ; do
         case "${copt%=*}" in
@@ -239,8 +239,8 @@ get_libdir() {
 #    use the system logger to log a message
 #
 esyslog() {
-    local pri=
-    local tag=
+    local pri
+    local tag
 
     if [ -x /usr/bin/logger ]
     then
@@ -437,11 +437,11 @@ ewend() {
 
 # v-e-commands honor RC_VERBOSE which defaults to no.
 # The condition is negated so the return value will be zero.
-veinfo()  { [ "${RC_VERBOSE}" != yes ] || einfo  "$@"; }
-veinfon() { [ "${RC_VERBOSE}" != yes ] || einfon "$@"; }
-vewarn()  { [ "${RC_VERBOSE}" != yes ] || ewarn  "$@"; }
-veerror() { [ "${RC_VERBOSE}" != yes ] || eerror "$@"; }
-vebegin() { [ "${RC_VERBOSE}" != yes ] || ebegin "$@"; }
+veinfo()  { [ "${RC_VERBOSE}" != "yes" ] || einfo  "$@"; }
+veinfon() { [ "${RC_VERBOSE}" != "yes" ] || einfon "$@"; }
+vewarn()  { [ "${RC_VERBOSE}" != "yes" ] || ewarn  "$@"; }
+veerror() { [ "${RC_VERBOSE}" != "yes" ] || eerror "$@"; }
+vebegin() { [ "${RC_VERBOSE}" != "yes" ] || ebegin "$@"; }
 veend() {
     [ "${RC_VERBOSE}" = "yes" ] && { eend "$@"; return $?; }
     return ${1:-0}
@@ -451,29 +451,6 @@ veend() {
     return ${1:-0}
 }
 
-# char *KV_major(string)
-#
-#    Return the Major (X of X.Y.Z) kernel version
-#
-KV_major() {
-    [ -z "$1" ] && return 1
-
-    local KV=$@
-    printf "${KV%%.*}\n"
-}
-
-# char *KV_minor(string)
-#
-#    Return the Minor (Y of X.Y.Z) kernel version
-#
-KV_minor() {
-    [ -z "$1" ] && return 1
-
-    local KV="$@"
-    KV="${KV#*.}"
-    printf "${KV%%.*}\n"
-}
-
 # char *KV_micro(string)
 #
 #    Return the Micro (Z of X.Y.Z) kernel version.
@@ -572,10 +549,10 @@ get_bootparam() {
 #          also, error checking is not that extensive ...
 #
 dolisting() {
-    local x=
-    local y=
-    local tmpstr=
-    local mylist=
+    local x
+    local y
+    local tmpstr
+    local mylist
     local mypath="$*"
 
     if [ "${mypath%/\*}" != "${mypath}" ]
@@ -587,7 +564,7 @@ dolisting() {
     do
         [ ! -e "${x}" ] && continue
 
-        if [ ! -d "${x}" ] && ( [ -L "${x}" -o -f "${x}" ] )
+        if [ ! -d "${x}" ] && ( [ -L "${x}" ] || [ -f "${x}" ] )
         then
             mylist="${mylist} $(ls "${x}" 2> /dev/null)"
         else