X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=etc%2Fgrml%2Flsb-functions;h=17a42a38d2173c83cc0bd8209dc7f82f9c05babf;hb=31dc671f573000a4e83b715c2f1e52829d604e1c;hp=a2690076afc0df796b52d3668cd7af26b23ad83f;hpb=3145c8f9f62d9a2d122c4c4489dbccb0f2251f7b;p=grml-etc-core.git

diff --git a/etc/grml/lsb-functions b/etc/grml/lsb-functions
index a269007..17a42a3 100644
--- a/etc/grml/lsb-functions
+++ b/etc/grml/lsb-functions
@@ -1,5 +1,6 @@
 # lsb init-functions
-# vim:ft=sh:tw=80
+#
+# based on:
 # /lib/lsb/init-functions for Debian -*- shell-script -*-
 #
 # Copyright (c) 2002-03 Chris Lawrence
@@ -29,6 +30,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 
+# log_*() functions {{{
 TPUT="${TPUT:-"/usr/bin/tput"}"
 
 _have_tput() {
@@ -100,12 +102,12 @@ log_end_msg() {
     if _have_tput ; then
         COLS="$("$TPUT" cols)"
         if [ -n "$COLS" ]; then
-            COL=$(( "$COLS" - 7 ))
+            COL=$(( $COLS - 7 ))
         else
             COL=73
         fi
         UP="$("$TPUT" cuu1)"
-        END="$("$TPUT" hpa $COL)"
+        END="$("$TPUT" hpa "$COL")"
         START="$("$TPUT" hpa 0)"
         #RED="$("$TPUT" setaf 1)"
         #NORMAL="$("$TPUT" op)"
@@ -123,70 +125,112 @@ log_end_msg() {
     fi
     return "$1"
 }
+# }}}
+
+# e*() output functions {{{
+# heavily based on gentoo's functions.sh; stripped down and modified
+# to match our needs.
+#
+# defined functions:
+#   ebegin()
+#   eend()
+#   eerror()
+#   eindent()
+#   einfo()
+#   einfon()
+#   eoutdent()
+#   esetdent()
+#   esyslog()
+#   ewarn()
+#   ewend()
+#
+# copyright 1999-2005 gentoo foundation
+# distributed under the terms of the gnu general public license v2
+# $header: /var/cvsroot/gentoo-src/rc-scripts/sbin/functions.sh,v 1.81.2.6 2005/05/15 20:00:31 vapier exp $
+
+# initialisation {{{
+# internal variables
+
+# Don't output to stdout?
+RC_QUIET_STDOUT="no"
 
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-src/rc-scripts/sbin/functions.sh,v 1.81.2.6 2005/05/15 20:00:31 vapier Exp $
-
-RC_GOT_FUNCTIONS="yes"
-
-# Different types of dependencies
-deptypes="need use"
-# Different types of order deps
-ordtypes="before after"
-
-#
-# Internal variables
-#
+# Default values for e-message indentation and dots
+RC_INDENTATION=''
+RC_DEFAULT_INDENT=2
+#RC_DOT_PATTERN=' .'
+RC_DOT_PATTERN=''
+# don't output to stdout?
+rc_quiet_stdout="no"
 
-# Dont output to stdout?
-RC_QUIET_STDOUT="no"
-RC_VERBOSE="${RC_VERBOSE:-no}"
+# default values for e-message indentation and dots
+rc_indentation=''
+rc_default_indent=2
+#rc_dot_pattern=' .'
+rc_dot_pattern=''
 
-# Should we use color?
+# should we use color?
 if [ -r /proc/cmdline ] ; then
-    grep -q ' nocolor' /proc/cmdline && RC_NOCOLOR='yes'
+  grep -q ' nocolor' /proc/cmdline && RC_NOCOLOR='yes'
 fi
+[ -n "$NOCOLORS" ] && RC_NOCOLOR='yes'
 RC_NOCOLOR="${RC_NOCOLOR:-no}"
+if [ "$RC_NOCOLOR" = "no" ] ; then
+  if [ -r /etc/grml_colors ] ; then
+    . /etc/grml_colors
+  fi
+fi
+
 # Can the terminal handle endcols?
-RC_ENDCOL="yes"
+if [ "${RC_NOCOLOR}" = "yes" ]; then
+  RC_ENDCOL="no"
+else
+  RC_ENDCOL="yes"
+fi
 
-#
-# Default values for rc system
-#
-RC_TTY_NUMBER=11
-RC_NET_STRICT_CHECKING="no"
-RC_PARALLEL_STARTUP="no"
-RC_USE_CONFIG_PROFILE="yes"
+# Setup COLS and ENDCOL so eend can line up the [ ok ]
+# width of [ ok ] == 7
+COLS="$(stty size 2>/dev/null | cut -d' ' -f2)"
+if [ -z "${COLS}" ] || [ "${COLS}" -le 0 ] ; then
+  COLS=80
+fi
 
-#
-# Default values for e-message indentation and dots
-#
-RC_INDENTATION=''
-RC_DEFAULT_INDENT=2
-#RC_DOT_PATTERN=' .'
-RC_DOT_PATTERN=''
+if [ "${RC_ENDCOL}" = "yes" ]; then
+  ENDCOL="[$(( ${COLS} - 8 ))G"
+else
+  ENDCOL=''
+fi
+
+# Setup the colors so our messages all look pretty
+if [ "${RC_NOCOLOR}" = "yes" ]; then
+  unset GOOD WARN BAD NORMAL HILITE BRACKET
+else
+  GOOD=''
+  WARN=''
+  BAD=''
+  NORMAL=''
+  HILITE=''
+  BRACKET=''
+fi
+#}}}
 
 # void esyslog(char* priority, char* tag, char* message)
 #
 #    use the system logger to log a message
 #
 esyslog() {
-    local pri
-    local tag
-
-    if [ -x /usr/bin/logger ]
-    then
-        pri="$1"
-        tag="$2"
+  local pri
+  local tag
 
-        shift 2
-        [ -z "$*" ] && return 0
+  [ "$#" -le 2 ] && return 0
+  if [ -x /usr/bin/logger ] ; then
+    pri="$1"
+    tag="$2"
+    shift 2
 
-        /usr/bin/logger -p "${pri}" -t "${tag}" -- "$*"
-    fi
+    /usr/bin/logger -p "${pri}" -t "${tag}" -- "$@"
+  fi
 
-    return 0
+  return 0
 }
 
 # void eindent(int num)
@@ -194,9 +238,9 @@ esyslog() {
 #    increase the indent used for e-commands.
 #
 eindent() {
-    local i=$1
-    (( i > 0 )) || (( i = RC_DEFAULT_INDENT ))
-    esetdent $(( ${#RC_INDENTATION} + i ))
+  local i="${1:-0}"
+  [ "$i" -gt 0 ] || i="${RC_DEFAULT_INDENT}"
+  esetdent $(( ${#RC_INDENTATION} + $i ))
 }
 
 # void eoutdent(int num)
@@ -204,9 +248,9 @@ eindent() {
 #    decrease the indent used for e-commands.
 #
 eoutdent() {
-    local i=$1
-    (( i > 0 )) || (( i = RC_DEFAULT_INDENT ))
-    esetdent $(( ${#RC_INDENTATION} - i ))
+  local i="${1:-0}"
+  [ "$i" -gt 0 ] || i="${RC_DEFAULT_INDENT}"
+  esetdent $(( ${#RC_INDENTATION} - $i ))
 }
 
 # void esetdent(int num)
@@ -215,9 +259,9 @@ eoutdent() {
 #    num defaults to 0
 #
 esetdent() {
-    local i=$1
-    (( i < 0 )) && (( i = 0 ))
-    RC_INDENTATION=$(printf "%${i}s" '')
+  local i="${1:-0}"
+  [ "$i" -lt 0 ] && i=0
+  RC_INDENTATION="$(printf "%${i}s" '')"
 }
 
 # void einfo(char* message)
@@ -225,9 +269,9 @@ esetdent() {
 #    show an informative message (with a newline)
 #
 einfo() {
-    einfon "$*\n"
-    LAST_E_CMD=einfo
-    return 0
+  einfon "$*\n"
+  LAST_E_CMD=einfo
+  return 0
 }
 
 # void einfon(char* message)
@@ -235,11 +279,11 @@ einfo() {
 #    show an informative message (without a newline)
 #
 einfon() {
-    [ "${RC_QUIET_STDOUT}" = "yes" ] && return 0
-    [ "${RC_ENDCOL}" != "yes" ] && [ "${LAST_E_CMD}" = "ebegin" ] && echo
-    printf " ${GOOD}*${NORMAL} ${RC_INDENTATION}$*"
-    LAST_E_CMD=einfon
-    return 0
+  [ "${RC_QUIET_STDOUT}" = "yes" ] && return 0
+  [ "${RC_ENDCOL}" != "yes" ] && [ "${LAST_E_CMD}" = "ebegin" ] && echo
+  printf " ${GOOD}*${NORMAL} ${RC_INDENTATION}$*"
+  LAST_E_CMD=einfon
+  return 0
 }
 
 # void ewarn(char* message)
@@ -247,18 +291,18 @@ einfon() {
 #    show a warning message + log it
 #
 ewarn() {
-    if [ "${RC_QUIET_STDOUT}" = "yes" ]; then
-        printf " $*\n"
-    else
-        [ "${RC_ENDCOL}" != "yes" ] && [ "${LAST_E_CMD}" = "ebegin" ] && echo
-        printf " ${WARN}*${NORMAL} ${RC_INDENTATION}$*\n"
-    fi
+  if [ "${RC_QUIET_STDOUT}" = "yes" ]; then
+      printf " $*\n"
+  else
+    [ "${RC_ENDCOL}" != "yes" ] && [ "${LAST_E_CMD}" = "ebegin" ] && echo
+    printf " ${WARN}*${NORMAL} ${RC_INDENTATION}$*\n"
+  fi
 
-    # Log warnings to system log
-    esyslog "daemon.warning" "rc-scripts" "$*"
+  # Log warnings to system log
+  esyslog "daemon.warning" "rc-scripts" "$@"
 
-    LAST_E_CMD=ewarn
-    return 0
+  LAST_E_CMD=ewarn
+  return 0
 }
 
 # void eerror(char* message)
@@ -266,18 +310,18 @@ ewarn() {
 #    show an error message + log it
 #
 eerror() {
-    if [ "${RC_QUIET_STDOUT}" = "yes" ]; then
-        printf " $*\n" >/dev/stderr
-    else
-        [ "${RC_ENDCOL}" != "yes" ] && [ "${LAST_E_CMD}" = "ebegin" ] && echo
-        printf " ${BAD}*${NORMAL} ${RC_INDENTATION}$*\n"
-    fi
+  if [ "${RC_QUIET_STDOUT}" = "yes" ]; then
+    printf " $*\n" >&2
+  else
+    [ "${RC_ENDCOL}" != "yes" ] && [ "${LAST_E_CMD}" = "ebegin" ] && echo
+    printf " ${BAD}*${NORMAL} ${RC_INDENTATION}$*\n"
+  fi
 
-    # Log errors to system log
-    esyslog "daemon.err" "rc-scripts" "$*"
+  # Log errors to system log
+  esyslog "daemon.err" "rc-scripts" "$@"
 
-    LAST_E_CMD=eerror
-    return 0
+  LAST_E_CMD=eerror
+  return 0
 }
 
 # void ebegin(char* message)
@@ -285,25 +329,25 @@ eerror() {
 #    show a message indicating the start of a process
 #
 ebegin() {
-    local msg="$*" dots spaces
-    spaces="$(printf '%'"${#RC_DOT_PATTERN}"'s' '')"
-    [ "${RC_QUIET_STDOUT}" = "yes" ] && return 0
-
-    if [ -n "${RC_DOT_PATTERN}" ]; then
-        dots=$(printf "%$(( COLS - 3 - ${#RC_INDENTATION} - ${#msg} - 7 ))s" '')
-        while [ "${dots#${spaces}}" != "${dots}" ] ; do
-            dots="${dots#${spaces}}${RC_DOT_PATTERN}"
-        done
-        msg="${msg}${dots}"
-    else
-        msg="${msg} ..."
-    fi
-    einfon "${msg}"
-    [ "${RC_ENDCOL}" = "yes" ] && echo
-
-    LAST_E_LEN=$(( 3 + ${#RC_INDENTATION} + ${#msg} ))
-    LAST_E_CMD=ebegin
-    return 0
+  local msg="$@" dots spaces
+  spaces="$(printf '%'"${#RC_DOT_PATTERN}"'s' '')"
+  [ "${RC_QUIET_STDOUT}" = "yes" ] && return 0
+
+  if [ -n "${RC_DOT_PATTERN}" ]; then
+    dots="$(printf "%$(( $COLS - 3 - ${#RC_INDENTATION} - ${#msg} - 7 ))s" '')"
+    while [ "${dots#${spaces}}" != "${dots}" ] ; do
+        dots="${dots#${spaces}}${RC_DOT_PATTERN}"
+    done
+    msg="${msg}${dots}"
+  else
+    msg="${msg} ..."
+  fi
+  einfon "${msg}"
+  [ "${RC_ENDCOL}" = "yes" ] && echo
+
+  LAST_E_LEN=$(( 3 + ${#RC_INDENTATION} + ${#msg} ))
+  LAST_E_CMD=ebegin
+  return 0
 }
 
 # void _eend(int error, char *efunc, char* errstr)
@@ -315,27 +359,27 @@ ebegin() {
 #    script.
 #
 _eend() {
-    local retval=${1:-0} efunc=${2:-eerror} msg
-    shift 2
+  local retval="${1:-0}" efunc="${2:-eerror}" msg
+  shift 2
 
-    if [ "${retval}" -eq 0 ]; then
-        [ "${RC_QUIET_STDOUT}" = "yes" ] && return 0
-        msg="${BRACKET}[ ${GOOD}ok${BRACKET} ]${NORMAL}"
-    else
-        if [ -n "$*" ]; then
-            "${efunc}" "$*"
-        fi
-        msg="${BRACKET}[ ${BAD}!!${BRACKET} ]${NORMAL}"
+  if [ "${retval}" -eq 0 ]; then
+    [ "${RC_QUIET_STDOUT}" = "yes" ] && return 0
+    msg="${BRACKET}[ ${GOOD}ok${BRACKET} ]${NORMAL}"
+  else
+    if [ "$#" -gt 0 ] ; then
+        "${efunc}" "$@"
     fi
+    msg="${BRACKET}[ ${BAD}!!${BRACKET} ]${NORMAL}"
+  fi
 
-    if [ "${RC_ENDCOL}" = "yes" ]; then
-        printf "${ENDCOL}  ${msg}\n"
-    else
-        [ "${LAST_E_CMD}" = "ebegin" ] || LAST_E_LEN=0
-        printf "%$(( "${COLS}" - "${LAST_E_LEN}" - 6 ))s%b\n" '' "${msg}"
-    fi
+  if [ "${RC_ENDCOL}" = "yes" ]; then
+    printf "${ENDCOL}  ${msg}\n"
+  else
+    [ "${LAST_E_CMD}" = "ebegin" ] || LAST_E_LEN=0
+    printf "%$(( ${COLS} - ${LAST_E_LEN} - 6 ))s%b\n" '' "${msg}"
+  fi
 
-    return ${retval}
+  return "${retval}"
 }
 
 # void eend(int error, char* errstr)
@@ -344,13 +388,13 @@ _eend() {
 #    if error, show errstr via eerror
 #
 eend() {
-    local retval=${1:-0}
-    shift
+  local retval="${1:-0}"
+  shift
 
-    _eend ${retval} eerror "$*"
+  _eend "${retval}" eerror "$@"
 
-    LAST_E_CMD=eend
-    return $retval
+  LAST_E_CMD=eend
+  return "$retval"
 }
 
 # void ewend(int error, char* errstr)
@@ -359,114 +403,34 @@ eend() {
 #    if error, show errstr via ewarn
 #
 ewend() {
-    local retval=${1:-0}
-    shift
-
-    _eend ${retval} ewarn "$*"
-
-    LAST_E_CMD=ewend
-    return $retval
-}
-
-# char *add_suffix(char * configfile)
-#
-#    Returns a config file name with the softlevel suffix
-#    appended to it.  For use with multi-config services.
-add_suffix() {
-    if [ "${RC_USE_CONFIG_PROFILE}" = "yes" -a -e "$1.${DEFAULTLEVEL}" ]
-    then
-        printf "$1.${DEFAULTLEVEL}\n"
-    else
-        printf "$1\n"
-    fi
-
-    return 0
-}
-
-# char *reverse_list(list)
-#
-#   Returns the reversed order of list
-#
-reverse_list() {
-    local ret
-    ret=''
-    while [ "$#" -gt 0 ] ; do
-        if [ -z "${ret}" ] ; then
-            ret="$1"
-        else
-            ret="$1 ${ret}"
-        fi
-        shift
-    done
-    printf '%s' "${ret}"
-}
-
+  local retval="${1:-0}"
+  shift
 
-# bool is_older_than(reference, files/dirs to check)
-#
-#   return 0 if any of the files/dirs are newer than
-#   the reference file
-#
-#   EXAMPLE: if is_older_than a.out *.o ; then ...
-is_older_than() {
-    local x
-    local ref="$1"
-    shift
+  _eend "${retval}" ewarn "$@"
 
-    for x in "$@" ; do
-        [ "${x}" -nt "${ref}" ] && return 0
-
-        if [ -d "${x}" ] ; then
-            is_older_than "${ref}" "${x}"/* && return 0
-        fi
-    done
-
-    return 1
+  LAST_E_CMD=ewend
+  return "$retval"
 }
-
-# Setup a basic $PATH.  Just add system default to existing.
-# This should solve both /sbin and /usr/sbin not present when
-# doing 'su -c foo', or for something like:  PATH= rcscript start
-PATH="/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/sbin:${PATH}"
-
-if [ "$(/sbin/consoletype 2> /dev/null)" = "serial" ] ; then
-    # We do not want colors/endcols on serial terminals
-    RC_NOCOLOR="yes"
-    RC_ENDCOL="no"
-fi
-
-for arg in "$@" ; do
-    case "${arg}" in
-        # Lastly check if the user disabled it with --nocolor argument
-        --nocolor|-nc)
-            RC_NOCOLOR="yes"
-            ;;
-    esac
-done
-
-# Setup COLS and ENDCOL so eend can line up the [ ok ]
-# width of [ ok ] == 7
-COLS="$(stty size 2>/dev/null | cut -d' ' -f2)"
-if [ -z "${COLS}" ] || [ "${COLS}" -le 0 ] ; then
-    COLS=80
-fi
-
-if [ "${RC_ENDCOL}" = "yes" ]; then
-    ENDCOL="[$(( ${COLS} - 8 ))G"
-else
-    ENDCOL=''
-fi
-
-# Setup the colors so our messages all look pretty
-if [ "${RC_NOCOLOR}" = "yes" ]; then
-    unset GOOD WARN BAD NORMAL HILITE BRACKET
-else
-    GOOD=''
-    WARN=''
-    BAD=''
-    NORMAL=''
-    HILITE=''
-    BRACKET=''
+#}}}
+
+# if we're using systemd then redefine functions
+# for output in systemd style
+if [ "$(cat /proc/1/comm 2>/dev/null)" = "systemd" ] ; then
+  einfo() {
+    printf "[  ${GREEN}OK${NORMAL}  ] %s\n" "$*"
+  }
+
+  ewarn() {
+    printf "[ ${YELLOW}WARN${NORMAL} ] %s\n" "$*"
+  }
+
+  eerror() {
+    printf "[ ${RED}FAIL${NORMAL} ] %s\n" "$*"
+  }
+
+  eend() {
+    :
+  }
 fi
 
-# vim:ts=4
+# vim: ft=sh tw=80 ts=4 foldmethod=marker