X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=sh-lib;h=9896f71c44b1c4046ccc4b808c89a8e7d61eaa65;hb=d4f7452489a4dbf9c8f7924fb8772988d7d73033;hp=79f0ae6eaece8c2faf510c3457b8a0f0f98c9e51;hpb=82236a90db1ea678898ab889fd505ac4edad9be5;p=grml-shlib.git

diff --git a/sh-lib b/sh-lib
index 79f0ae6..9896f71 100644
--- a/sh-lib
+++ b/sh-lib
@@ -347,18 +347,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
@@ -551,7 +545,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
@@ -574,50 +568,48 @@ 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
-    $error_function_ "unknown action: \"$action\""
-    return 1
   done
+  $known_action_ || warn "_touchService(): unknown action \"$action_\""
+
 
-  service_="${INITD_DIR__}/$service_"
-  if [ ! -e "$service_" ]; then
-    $error_function_ "service does not exist: \"$service_\""
+  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_" ]; then
-    $error_function_ "service is not executable: \"$service_\""
+  if [ ! -x "$service_path_" ]; then
+    warn "_touchService(): service is not executable: \"$service_\""
   fi
   
-  "$service_" "$action_"
+  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" "force-reload"; do
-    eval "\
-function ${i}Service
-{
-  local service_=\"\$1\"
-  local error_function_=\${2:-\"eprint\"}    # function to call on error
-  local message_=\"\$3\"    # user supplied error message
-  
-  local ret_=\"\"
-  _touchService ${i} \"\$service_\"
-  ret_=\$?
-  if [[ \$ret_ != 0 ]]; then
-    if [ -z \"\$message_\" ]; then
-      \"\$error_function_\" \"Problems ${i}ing service \"\$service_\"\" \$ret_
-    else
-      \"\$error_function_\" \"\$message_\" \$ret_
-    fi
-    return 1
-  fi
-}"
+    eval "function ${i}Service { _touchService ${i} \"\$1\" \"\$2\" \"\$3\"; }"
   done
 }
 _createServiceFunctions
@@ -711,7 +703,7 @@ function _setDebugLevel
   local debug_="${DEBUG:-0}"
   VERBOSE__="$debug_"
 }
-_checkBootParam
+_setDebugLevel
 # }}}
 
 # END OF FILE