Mirrors_Framework/PX4-Autopilot
1
0
Fork 0
mirror of https://github.com/PX4/PX4-Autopilot.git synced 2026-06-02 03:49:12 +08:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

fix find in "files_to_check_code_style.sh" (#23269)

Browse Source 
* refactor: not necessary  "if [ -f "$FILE" ]"

* fix: exclude directories

---------

Co-authored-by: Isidro Arias <isidro.arias@wslw.es>
This commit is contained in:
Isidro
2024-06-15 03:41:05 +02:00
committed by GitHub
parent 8258cd63ba
commit 4fe0bb4762
2 changed files with 14 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Tools/astyle/check_code_style.sh
+13 -15
View File
@@ -3,22 +3,20 @@
FILE=$1 FILE=$1
DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd ) DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
if [ -f "$FILE" ]; then CHECK_FAILED=$(${DIR}/fix_code_style.sh --dry-run --formatted $FILE)
CHECK_FAILED=$(${DIR}/fix_code_style.sh --dry-run --formatted $FILE) if [ -n "$CHECK_FAILED" ]; then
if [ -n "$CHECK_FAILED" ]; then ${DIR}/fix_code_style.sh --quiet < $FILE > $FILE.pretty
${DIR}/fix_code_style.sh --quiet < $FILE > $FILE.pretty
echo -e 'Formatting issue found in' $FILE echo -e 'Formatting issue found in' $FILE
echo echo
git --no-pager diff --no-index --minimal --histogram --color=always $FILE $FILE.pretty | grep -vE -e "^.{,4}diff.*\.pretty.{,3}$" -e "^.{,4}--- a/.*$" -e "^.{,4}\+\+\+ b/.*$" -e "^.{,5}@@ .* @@.*$" -e "^.{,4}index .{10}\.\." git --no-pager diff --no-index --minimal --histogram --color=always $FILE $FILE.pretty | grep -vE -e "^.{,4}diff.*\.pretty.{,3}$" -e "^.{,4}--- a/.*$" -e "^.{,4}\+\+\+ b/.*$" -e "^.{,5}@@ .* @@.*$" -e "^.{,4}index .{10}\.\."
rm -f $FILE.pretty rm -f $FILE.pretty
echo echo
if [[ $PX4_ASTYLE_FIX -eq 1 ]]; then if [[ $PX4_ASTYLE_FIX -eq 1 ]]; then
${DIR}/fix_code_style.sh $FILE ${DIR}/fix_code_style.sh $FILE
else else
echo 'to fix automatically run "make format" or "./Tools/astyle/fix_code_style.sh' $FILE'"' echo 'to fix automatically run "make format" or "./Tools/astyle/fix_code_style.sh' $FILE'"'
exit 1 exit 1
fi
fi fi
fi fi
Tools/astyle/files_to_check_code_style.sh
+1 -1
View File
@@ -31,4 +31,4 @@ exec find boards msg src platforms test \
-path src/lib/cdrstream/rosidl -prune -o \ -path src/lib/cdrstream/rosidl -prune -o \
-path src/modules/zenoh/zenoh-pico -prune -o \ -path src/modules/zenoh/zenoh-pico -prune -o \
-path boards/modalai/voxl2/libfc-sensor-api -prune -o \ -path boards/modalai/voxl2/libfc-sensor-api -prune -o \
-type f \( -name "*.c" -o -name "*.h" -o -name "*.cpp" -o -name "*.hpp" \) | grep $PATTERN \( -type f \( -name "*.c" -o -name "*.h" -o -name "*.cpp" -o -name "*.hpp" \) -print \) | grep $PATTERN