X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=etc%2Fgrml%2Fscript-functions;h=a39e3d8a34ce783493e6e836f6baf09d46893fb0;hb=69d4655e7691826d627510926aa919ddeb1f5fa0;hp=0a389e9071920f29df18f5712879b01d6f9a0e5d;hpb=f5b996ec4d80add3c921e213a2a75ae8f6f7d346;p=grml-etc-core.git

diff --git a/etc/grml/script-functions b/etc/grml/script-functions
index 0a389e9..a39e3d8 100644
--- a/etc/grml/script-functions
+++ b/etc/grml/script-functions
@@ -3,7 +3,6 @@
 # Authors:       grml-team (grml.org), (c) Michael Prokop <mika@grml.org>
 # Bug-Reports:   see http://grml.org/bugs/
 # License:       This file is licensed under the GPL v2.
-# Latest change: Fre Apr 06 22:42:04 CEST 2007 [mika]
 ################################################################################
 
 # {{{ set default PATH
@@ -52,7 +51,7 @@ setdialog(){
 check4progs(){
   local RC=''
   for arg in $* ; do
-    type -p $arg >/dev/null 2>&1 || RC="$arg"
+    which $arg >/dev/null 2>&1 || RC="$arg"
   done
   if [ -n "$RC" ] ; then
      echo "$RC not installed"
@@ -77,8 +76,9 @@ stringinstring(){
 
 # {{{ reread boot command line; echo last parameter's argument or return false.
 getbootparam(){
-  stringinstring " $1=" /proc/cmdline || return 1
-  result="${/proc/cmdline##*$1=}"
+  CMDLINE=$(cat /proc/cmdline)
+  stringinstring " $1=" "$CMDLINE" || return 1
+  result="${CMDLINE##*$1=}"
   result="${result%%[   ]*}"
   echo "$result"
   return 0
@@ -87,7 +87,7 @@ getbootparam(){
 
 # {{{ check boot commandline for specified option
 checkbootparam(){
-  stringinstring " $1" /proc/cmdline
+  stringinfile " $1" /proc/cmdline
   return "$?"
 }
 # }}}
@@ -146,17 +146,17 @@ mount_sys(){
 #   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 ret
+  ret=''
+  while [ "$#" -gt 0 ] ; do
+    if [ -z "${ret}" ] ; then
+      ret="$1"
+    else
+      ret="$1 ${ret}"
+    fi
+    shift
+  done
+  printf '%s' "${ret}"
 }
 #}}}
 
@@ -167,19 +167,19 @@ reverse_list() {
 #
 #   EXAMPLE: if is_older_than a.out *.o ; then ...
 is_older_than() {
-    local x
-    local ref="$1"
-    shift
+  local x
+  local ref="$1"
+  shift
 
-    for x in "$@" ; do
-        [ "${x}" -nt "${ref}" ] && return 0
+  for x in "$@" ; do
+    [ "${x}" -nt "${ref}" ] && return 0
 
-        if [ -d "${x}" ] ; then
-            is_older_than "${ref}" "${x}"/* && return 0
-        fi
-    done
+    if [ -d "${x}" ] ; then
+      is_older_than "${ref}" "${x}"/* && return 0
+    fi
+  done
 
-    return 1
+  return 1
 }
 #}}}