fix mkfwimage to recognize the -s option

[openwrt.git] / include / shell.sh

diff --git a/include/shell.sh b/include/shell.sh
index 6ee0cf6..f6be6c5 100644 (file)
--- a/include/shell.sh
+++ b/include/shell.sh
@@ -13,3 +13,22 @@ isset() {
        eval "var=\"\${$1}\""
        [ -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>&1 >/dev/null && md5sum "$@" | awk '{print $1}' || md5 "$@"
+}