From 324e49c9ff955818339b6eacd8b70726f7bf239f Mon Sep 17 00:00:00 2001 From: wangpeng Date: Thu, 22 Jul 2021 16:05:12 +0800 Subject: [PATCH 1/4] test --- test.txt | 1 + 1 file changed, 1 insertion(+) create mode 100644 test.txt diff --git a/test.txt b/test.txt new file mode 100644 index 00000000..9daeafb9 --- /dev/null +++ b/test.txt @@ -0,0 +1 @@ +test -- Gitee From 31fa92635252ec042b83b9948b09acbd37c43643 Mon Sep 17 00:00:00 2001 From: wangpeng Date: Thu, 22 Jul 2021 16:09:23 +0800 Subject: [PATCH 2/4] rm test.txt --- test.txt | 1 - 1 file changed, 1 deletion(-) delete mode 100644 test.txt diff --git a/test.txt b/test.txt deleted file mode 100644 index 9daeafb9..00000000 --- a/test.txt +++ /dev/null @@ -1 +0,0 @@ -test -- Gitee From 32de8a47a10161f8bf4ea569507e710370bb8dee Mon Sep 17 00:00:00 2001 From: wangpeng Date: Tue, 27 Jul 2021 15:46:44 +0800 Subject: [PATCH 3/4] update common_lib.sh/function SLEEP_WAIT --- mugen/libs/locallibs/common_lib.sh | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/mugen/libs/locallibs/common_lib.sh b/mugen/libs/locallibs/common_lib.sh index cf0e1a07..bc22ce3c 100644 --- a/mugen/libs/locallibs/common_lib.sh +++ b/mugen/libs/locallibs/common_lib.sh @@ -86,17 +86,19 @@ function SLEEP_WAIT() { wait_time=${1-1} cmd=$2 sleep_time=0 - - while [ $sleep_time -lt $wait_time ]; do - sleep 1 - if [ -n "$cmd" ]; then + if [ -n "$cmd" ]; then + while [ $sleep_time -lt $wait_time ]; do + sleep 1 if $cmd; then return 0 fi - fi - ((sleep_time++)) - done -} + ((sleep_time++)) + rerutn 1 + done + else + sleep "${wait_time}" + fi + } function REMOTE_REBOOT_WAIT() { remoteip=$1 -- Gitee From c01ad824df79dceddd51489b9e6f78aecae5948c Mon Sep 17 00:00:00 2001 From: wangpeng Date: Tue, 27 Jul 2021 16:10:04 +0800 Subject: [PATCH 4/4] update common_lib.sh/function SLEEP_WAIT --- mugen/libs/locallibs/common_lib.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/mugen/libs/locallibs/common_lib.sh b/mugen/libs/locallibs/common_lib.sh index bc22ce3c..7356f3af 100644 --- a/mugen/libs/locallibs/common_lib.sh +++ b/mugen/libs/locallibs/common_lib.sh @@ -93,13 +93,12 @@ function SLEEP_WAIT() { return 0 fi ((sleep_time++)) - rerutn 1 done + return 1 else sleep "${wait_time}" fi } - function REMOTE_REBOOT_WAIT() { remoteip=$1 remotepasswd=$2 -- Gitee