X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=sh-lib;h=9330a5b96a573fcc068cadffe668d9483cf3d43f;hb=4a14c07dbcde063b32bbe8e30664d58d5212e94a;hp=8b0af2b7eaf6c5b73afb55eb8b2e9a71ec636538;hpb=729fe026dc05799ed86acd2731358ab1a805662f;p=grml-shlib.git

diff --git a/sh-lib b/sh-lib
index 8b0af2b..9330a5b 100644
--- a/sh-lib
+++ b/sh-lib
@@ -14,6 +14,9 @@ VERBOSE_TMP__=0
 # FIXME maybe PROG_PATH__ for better error reporting?
 PROG_NAME__=""    # initialised within init section
 
+# directory for init scripts
+INITD_DIR__="/etc/init.d/"
+
 # >= level and the function will print the message
 EPRINT__=1    # eprint (error print)
 EEPRINT__=2   # 2print (intern error print)
@@ -303,6 +306,16 @@ function checkRoot
   checkId 0 "$1" "$2"
 }
 
+function isGrml
+{
+  if [ -f /etc/grml_version ] ; then 
+    dprint "isGrml(): this seems to be a grml system"
+    return 0                       
+  else                               
+    dprint "isGrml(): this is not a grml system"
+    return 1                       
+  fi                                 
+}
 
 function runsFromHd
 {
@@ -344,18 +357,12 @@ function secureInput
 function relToAbs
 {
   local relpath_="$1"
-
-  local D_=''
-  local B_=''
   local abspath_=''
-  local end_path_=''
 
-  D_=`dirname "$relpath_"`
-  B_=`basename "$relpath_"`
-  abspath_=`cd "$D_" 2>/dev/null && pwd || echo "$D_"`/$B_
-  end_path_=`echo "$abspath_" |tr --squeeze-repeats /`
-  dprint "relToAbs(): \"$relpath_\" => \"$end_path_\""
-  echo "$end_path_"
+  abspath_="`readlink -f \"$relpath_\"`" || \
+    warn "relToAbs(): Problems getting absolute path" "$?" || return 1
+  dprint "relToAbs(): \"$relpath_\" => \"$abspath_\""
+  echo "$abspath_"
 }
 
 # Simple shell grep
@@ -548,7 +555,7 @@ function netGetNameservers
   fi
   
   setCLang
-  ns_=`awk '/^nameserver/{printf "%s ",$2}' $file_`
+  ns_=`awk '/^nameserver/{printf "%s ",$2}' $file_ |xargs echo`
   restoreLang
   if [ -z "$ns_" ]; then
     if [ -z "$message_" ]; then
@@ -565,6 +572,58 @@ function netGetNameservers
 
 # }}}
 
+# SERVICES {{{
+function _touchService
+{
+  local action_="${1:-"start"}"
+  local service_="$2"
+  local error_function_=${3:-"eprint"}    # function to call on error
+  local message_="$4"     # user supplied error message
+
+  local i=""
+  local known_action_='false'
+  for i in "start" "stop" "restart" "reload" "force-reload"; do
+    if [[ $i == $action_ ]]; then
+      known_action_='true'
+      break
+    fi
+  done
+  $known_action_ || warn "_touchService(): unknown action \"$action_\""
+
+
+  local service_path_=""
+  service_path_="${INITD_DIR__}/$service_"
+  if [ ! -e "$service_path_" ]; then
+    warn "_touchService(): service does not exist: \"$service_\""
+    return 1
+  fi
+  if [ ! -x "$service_path_" ]; then
+    warn "_touchService(): service is not executable: \"$service_\""
+  fi
+  
+  local ret_=""
+  "$service_path_" "$action_"
+  ret_=$?
+  if [[ $ret_ != 0 ]]; then
+    if [ -z "$message_" ]; then
+      "$error_function_" "Problems ${action_}ing service \"$service_\"" $ret_
+    else
+      "$error_function_" "$message_" $ret_
+    fi
+    return 1
+  fi
+  dprint "_touchService(): successfully started service \"$service_\""
+  return 0
+}
+
+function _createServiceFunctions
+{
+  for i in "start" "stop" "restart" "reload" "forcereload"; do
+    eval "function ${i}Service { _touchService ${i} \"\$1\" \"\$2\" \"\$3\"; }"
+  done
+}
+_createServiceFunctions
+# }}}
 
 # prints the next free /dev/loop* to stdout
 function findNextFreeLoop
@@ -654,7 +713,7 @@ function _setDebugLevel
   local debug_="${DEBUG:-0}"
   VERBOSE__="$debug_"
 }
-_checkBootParam
+_setDebugLevel
 # }}}
 
 # END OF FILE