yemai/bizhang_-obav
1
0
Fork 0
mirror of https://gitee.com/xiaohuolufeihua/bizhang_-obav.git synced 2026-05-21 01:12:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

shellcheck fix rc.autostart return and improve globbing

Browse Source
This commit is contained in:
Daniel Agar
2018-11-30 21:01:29 -05:00
parent 3e9e5ed372
commit 161cf7f5d9
3 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@@ -401,7 +401,7 @@ cppcheck: px4_sitl_default
shellcheck_all: shellcheck_all:
@"$(SRC_DIR)"/Tools/run-shellcheck.sh "$(SRC_DIR)"/ROMFS/px4fmu_common/ @"$(SRC_DIR)"/Tools/run-shellcheck.sh "$(SRC_DIR)"/ROMFS/px4fmu_common/
@make px4_fmu-v2_default shellcheck @make px4_fmu-v5_default shellcheck
validate_module_configs: validate_module_configs:
@find "$(SRC_DIR)"/src/modules "$(SRC_DIR)"/src/drivers "$(SRC_DIR)"/src/lib -name *.yaml -type f -print0 | xargs -0 "$(SRC_DIR)"/Tools/validate_yaml.py --schema-file "$(SRC_DIR)"/validation/module_schema.yaml @find "$(SRC_DIR)"/src/modules "$(SRC_DIR)"/src/drivers "$(SRC_DIR)"/src/lib -name *.yaml -type f -print0 | xargs -0 "$(SRC_DIR)"/Tools/validate_yaml.py --schema-file "$(SRC_DIR)"/validation/module_schema.yaml

3
ROMFS/CMakeLists.txt
View File

@@ -188,6 +188,7 @@ set_target_properties(romfs PROPERTIES LINKER_LANGUAGE C)
find_program(SHELLCHECK_PATH shellcheck) find_program(SHELLCHECK_PATH shellcheck)
if(SHELLCHECK_PATH) if(SHELLCHECK_PATH)
# TODO: fix SC2086, SC2166 # TODO: fix SC2086, SC2166
add_custom_target(shellcheck add_custom_target(shellcheck
COMMAND ${SHELLCHECK_PATH} --shell=sh COMMAND ${SHELLCHECK_PATH} --shell=sh
@@ -195,7 +196,7 @@ if(SHELLCHECK_PATH)
--exclude=SC2086 # SC2086: Double quote to prevent globbing and word splitting. --exclude=SC2086 # SC2086: Double quote to prevent globbing and word splitting.
--exclude=SC2166 # SC2166: Prefer [ p ] || [ q ] as [ p -o q ] is not well defined. --exclude=SC2166 # SC2166: Prefer [ p ] || [ q ] as [ p -o q ] is not well defined.
--exclude=SC2154 # SC2154: <var> is referenced but not assigned (NuttX uses different asssignment) --exclude=SC2154 # SC2154: <var> is referenced but not assigned (NuttX uses different asssignment)
init.d/* `find ${romfs_gen_root_dir}/init.d -type f`
DEPENDS ${romfs_gen_root_dir}/init.d/rc.autostart DEPENDS ${romfs_gen_root_dir}/init.d/rc.autostart
WORKING_DIRECTORY ${romfs_gen_root_dir} WORKING_DIRECTORY ${romfs_gen_root_dir}
USES_TERMINAL USES_TERMINAL

2
Tools/px4airframes/rcout.py
View File

@@ -30,7 +30,7 @@ class RCOutput():
"# 14000 .. 14999 Tri Y\n" "# 14000 .. 14999 Tri Y\n"
"" ""
"" ""
"cd /etc/init.d/airframes\n" "cd /etc/init.d/airframes || return\n"
"\n") "\n")
for group in groups: for group in groups:
result += "# GROUP: %s\n\n" % group.GetName() result += "# GROUP: %s\n\n" % group.GetName()