From 9f204488319608db1253adbdf98f4aeb5f72cc25 Mon Sep 17 00:00:00 2001 From: Oleg Kalachev Date: Wed, 10 Apr 2024 21:21:09 +0300 Subject: [PATCH] Fix shellcheck errors --- builder/image-ros.sh | 4 ++-- builder/image-software.sh | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/builder/image-ros.sh b/builder/image-ros.sh index 6cd2eb9e..16dae1e1 100755 --- a/builder/image-ros.sh +++ b/builder/image-ros.sh @@ -54,7 +54,7 @@ my_travis_retry() { local max_count=5 while [ $count -le $max_count ]; do [ $result -ne 0 ] && { - echo -e "\nThe command \"$@\" failed. Retrying, $count of $max_count.\n" >&2 + echo -e "\nThe command \"$*\" failed. Retrying, $count of $max_count.\n" >&2 } # ! { } ignores set -e, see https://stackoverflow.com/a/4073372 ! { "$@"; result=$?; } @@ -64,7 +64,7 @@ my_travis_retry() { done [ $count -gt $max_count ] && { - echo -e "\nThe command \"$@\" failed $max_count times.\n" >&2 + echo -e "\nThe command \"$*\" failed $max_count times.\n" >&2 } return $result diff --git a/builder/image-software.sh b/builder/image-software.sh index d10afe4a..dbec3b31 100755 --- a/builder/image-software.sh +++ b/builder/image-software.sh @@ -43,7 +43,7 @@ my_travis_retry() { local count=1 while [ $count -le 3 ]; do [ $result -ne 0 ] && { - echo -e "\n${ANSI_RED}The command \"$@\" failed. Retrying, $count of 3.${ANSI_RESET}\n" >&2 + echo -e "\n${ANSI_RED}The command \"$*\" failed. Retrying, $count of 3.${ANSI_RESET}\n" >&2 } # ! { } ignores set -e, see https://stackoverflow.com/a/4073372 ! { "$@"; result=$?; } @@ -53,7 +53,7 @@ my_travis_retry() { done [ $count -gt 3 ] && { - echo -e "\n${ANSI_RED}The command \"$@\" failed 3 times.${ANSI_RESET}\n" >&2 + echo -e "\n${ANSI_RED}The command \"$*\" failed 3 times.${ANSI_RESET}\n" >&2 } return $result