From bef210ca6c84aedd9e64176ced43827cf6b5a5e8 Mon Sep 17 00:00:00 2001 From: olli Date: Mon, 6 Feb 2023 14:17:50 +0100 Subject: [PATCH] added workaround for "test" cmd - return code !=0 OK --- gaboshlib/g_retrycmd.bashfunc | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gaboshlib/g_retrycmd.bashfunc b/gaboshlib/g_retrycmd.bashfunc index 5f472cf..d434c82 100644 --- a/gaboshlib/g_retrycmd.bashfunc +++ b/gaboshlib/g_retrycmd.bashfunc @@ -14,8 +14,9 @@ function g_retrycmd { ((g_try=g_try+1)) #>&2 echo "$(g_date_print) Try $g_try of $g_tries" echo "$@" >$g_tmp/g_retrycmd.cmd - bash $g_tmp/g_retrycmd.cmd && break + bash $g_tmp/g_retrycmd.cmd && return 0 g_return=$? + grep -q "test " $g_tmp/g_retrycmd.cmd && return 0 if [ $g_try -eq $g_tries ] then [ -z "$g_return" ] || g_echo_error "${FUNCNAME}: $@ failed all $g_tries tries" @@ -24,5 +25,5 @@ function g_retrycmd { sleep $g_tries_delay done - return 0 + return ${g_return} }