X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=etc%2Fgrml%2Fscript-functions;h=887cf2c1fa3743e6dc61ed23635149c78262cb7f;hb=3d5b16f470105b91bac350934155444aa13902e3;hp=bc30ca5c83547bef0c583ab3e4f45f8de0147665;hpb=aae4ec9f95e42b6423996147d813a280ad5166ac;p=grml-etc-core.git

diff --git a/etc/grml/script-functions b/etc/grml/script-functions
index bc30ca5..887cf2c 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: Sam Sep 16 13:08:16 CEST 2006 [mika]
 ################################################################################
 
 # {{{ set default PATH
@@ -14,7 +13,7 @@ setpath(){
 
 # {{{ check for root-permissions
 check4root(){
-  if [ "$UID" != 0 ] ; then
+  if [ "$(id -u 2>/dev/null)" != 0 ] ; then
     echo 1>&2 "Error: please run this script with uid 0 (root)." ; return 1
   fi
 }
@@ -22,7 +21,7 @@ check4root(){
 
 # {{{ check for user permissions
 check4user(){
-  if [ "$UID" == 0 ] ; then
+  if [ "$(id -u 2>/dev/null)" = 0 ] ; then
     echo 1>&2 "Error: please do not run this script with uid 0 (root)." ; return 1
   fi
 }
@@ -49,15 +48,25 @@ setdialog(){
 # }}}
 
 # {{{ check for availability of program(s)
-check4progs(){
-  local RC=''
-  for arg in $* ; do
-    type -p $arg >/dev/null 2>&1 || RC="$arg"
-  done
-  if [ -n "$RC" ] ; then
-     echo "$RC not installed"
-     return 1
-  fi
+check4progs() {
+    local RTN=0
+    local ARG=''
+    while [ ${#} -gt 0 ]
+    do
+        ARG="${1}"
+        shift
+
+        # check for availability
+        if ! \which "${ARG}" >/dev/null 2>&1
+        then
+            printf "%s: binary not found\n" "${ARG}" >&2
+            RTN=1
+        fi
+
+    done
+
+    # return non zero, if at least one prog is missing!
+    return ${RTN}
 }
 # }}}
 
@@ -77,8 +86,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 +97,7 @@ getbootparam(){
 
 # {{{ check boot commandline for specified option
 checkbootparam(){
-  stringinstring " $1" /proc/cmdline
+  stringinfile " $1" /proc/cmdline
   return "$?"
 }
 # }}}
@@ -141,5 +151,47 @@ mount_sys(){
 }
 # }}}
 
+# 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}"
+}
+#}}}
+
+# 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
+
+  for x in "$@" ; do
+    [ "${x}" -nt "${ref}" ] && return 0
+
+    if [ -d "${x}" ] ; then
+      is_older_than "${ref}" "${x}"/* && return 0
+    fi
+  done
+
+  return 1
+}
+#}}}
+
 ## END OF FILE #################################################################
 # vim:foldmethod=marker tw=80 ai expandtab shiftwidth=2 tabstop=2