gre: add different per-protocol prefixes to GRE-TAP IPv4/6 tunnel interfaces.

[openwrt/openwrt.git] / include / shell.sh

diff --git a/include/shell.sh b/include/shell.sh
index db4100326277cce3c16e7f9cbb31b57f5bd1c591..8f6f6f04bb414e5dc24851d6dceefe8d282782f4 100644 (file)
--- a/include/shell.sh
+++ b/include/shell.sh
@@ -14,21 +14,9 @@ isset() {
        [ -n "$var" ]
 }
 
-trapret() {(
-       local retvals="$1"; shift
-       local cmd="$1"; shift
-       for retval in $(echo $retvals); do
-               local trap_$retval=1
-       done
-       "$cmd" "$@" || {
-               local retval="$?"
-               eval "trapped=\${trap_$retval}"
-               [ -n "$trapped" ] || {
-                       return $retval
-               }
-       }
-)}
-
 md5s() {
-       which md5sum 2>&- >&- && md5sum "$@" | awk '{print $1}' || md5 "$@"
+       cat "$@" | (
+               md5sum 2>/dev/null ||
+               md5
+       ) | awk '{print $1}'
 }