Skip to content

Commit 14e92be

Browse files
andy5995claude
andcommitted
fix: resolve shellcheck warnings in COMMON and fix CI path
- Add shell directive to COMMON (SC2148) - Quote variables, fix backticks/expr, fix -o in [ ] (SC2086/SC2006/SC2003/SC2166) - Fix pattern expansion quoting in cmp_substr (SC2295) - Quote basename argument (SC2086) - Fix broken echo strings in error message - Remove unused TESTS_DIR variable - Add SC2034 disable comments for variables used by sourcing scripts - Update SHELLCHECK_OPTS path to test/ so shellcheck can follow COMMON source Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
1 parent e962ba3 commit 14e92be

File tree

2 files changed

+22
-14
lines changed

2 files changed

+22
-14
lines changed

.github/workflows/shellcheck.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,4 +21,4 @@ jobs:
2121
- name: Run ShellCheck
2222
uses: ludeeus/action-shellcheck@master
2323
env:
24-
SHELLCHECK_OPTS: -x -P $GITHUB_WORKSPACE
24+
SHELLCHECK_OPTS: -x -P $GITHUB_WORKSPACE/test

test/COMMON

Lines changed: 21 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,50 +1,58 @@
1-
# included by tests scripts
1+
# shellcheck shell=sh
2+
# included by test scripts
23

34
create_some_files() {
45
mkdir -p somefiles/topdir/dir1/dir2/dir3
56

67
c=1
7-
while [ $c -lt 25 ]
8+
while [ "$c" -lt 25 ]
89
do
9-
touch somefiles/topdir/dir1/dir2/dir3/$c
10-
c=`expr $c + 1`
10+
touch "somefiles/topdir/dir1/dir2/dir3/$c"
11+
c=$((c + 1))
1112
done
1213

1314
touch somefiles/read_only_file
1415
chmod ugo-w somefiles/read_only_file
1516
}
1617

1718
cmp_substr () {
18-
if [ -z "$1" -o -z "$2" ]; then
19+
if [ -z "$1" ] || [ -z "$2" ]; then
1920
return 1
2021
fi
21-
[ -z "${1##*$2*}" ]
22+
[ -z "${1##*"$2"*}" ]
2223
return $?
2324
}
2425

2526
if test -z "${MESON_BUILD_ROOT}" || test -z "${RMW_FAKE_HOME}"; then
26-
echo "This script is used by the build system. Use 'meson test'
27-
echo 'from the builddir."
27+
echo "This script is used by the build system. Use 'meson test'"
28+
echo "from the builddir."
2829
exit 1
2930
fi
3031

31-
RMW_FAKE_HOME="${RMW_FAKE_HOME}"/$(basename $0)_dir
32-
TESTS_DIR="${MESON_SOURCE_ROOT}/test"
32+
RMW_FAKE_HOME="${RMW_FAKE_HOME}/$(basename "$0")_dir"
33+
# shellcheck disable=SC2034
3334
CONFIG="${MESON_SOURCE_ROOT}/test/conf/rmw.testrc"
35+
# shellcheck disable=SC2034
3436
ALT_CONFIG="${MESON_SOURCE_ROOT}/test/conf/rmw.alt.testrc"
37+
# shellcheck disable=SC2034
3538
PURGE_DISABLED_CONFIG="${MESON_SOURCE_ROOT}/test/conf/rmw.purge_disabled.testrc"
3639
export BIN_DIR="${MESON_BUILD_ROOT}"
3740

3841
export RMW_FAKE_HOME
3942

40-
if [ -e ${RMW_FAKE_HOME} ]; then
41-
rm -rf ${RMW_FAKE_HOME}
43+
if [ -e "${RMW_FAKE_HOME}" ]; then
44+
rm -rf "${RMW_FAKE_HOME}"
4245
fi
4346

47+
# shellcheck disable=SC2034
4448
RMW_TEST_CMD_STRING="${BIN_DIR}/rmw -c $CONFIG"
4549

46-
PRIMARY_WASTE_DIR="${RMW_FAKE_HOME}"/.Waste
50+
# shellcheck disable=SC2034
51+
PRIMARY_WASTE_DIR="${RMW_FAKE_HOME}/.Waste"
4752

53+
# shellcheck disable=SC2034
4854
RMW_ALT_TEST_CMD_STRING="${BIN_DIR}/rmw -c ${ALT_CONFIG}"
55+
# shellcheck disable=SC2034
4956
RMW_PURGE_DISABLED_CMD="${BIN_DIR}/rmw -c ${PURGE_DISABLED_CONFIG}"
57+
# shellcheck disable=SC2034
5058
SEPARATOR="\n\n--- "

0 commit comments

Comments
 (0)