epm-sh: fix withtimeout

7696a7fc · Vitaly Lipatov · 2bccd0ef · 7696a7fc
Commit 7696a7fc authored Feb 25, 2015 by Vitaly Lipatov
Show whitespace changes
Inline Side-by-side

Showing with 5 additions and 2 deletions

epm-sh-functions bin/epm-sh-functions +5 -2

No files found.
--- a/bin/epm-sh-functions
+++ b/bin/epm-sh-functions
@@ -267,8 +267,11 @@ set_sudo()
 withtimeout()
 {
 	local TO=$(which timeout 2>/dev/null || which gtimeout 2>/dev/null)
-	[ -n "$TO" ] && $TO $@ && return
+	if [ -x "$TO" ] ; then
-	# drop time arg
+		$TO $@
+		return
+	fi
+	# fallback: drop time arg and run without timeout
 	shift
 	$@
 }