commit 0ce40847531ed491ce80a89cf1437178d84b2229
author Jiyong Park <jiyong@google.com> Sat Jan 30 11:34:10 2021 +0900
committer Treehugger Robot <treehugger-gerrit@google.com> Sat Jan 30 04:07:32 2021 +0000
tree 35faf66b702c45920815a9768938c38c3cec19f9
parent 4435396c2b5b201cda4d0c6528593a43735d5132

Check the existence of .aidl-format before using it

Bug: 178876998
Test: add a new aidl file that isn't correctly formatted.
create a CL, and run `repo upload`.
The formatting error is detected and automatic fix is applied.
Amend the comment and re-run `repo upload`.
No error.

Change-Id: Ib7a038c00fb4801b50edee9aed5defe6c1789098

aidl-format.sh

diff --git a/aidl-format.sh b/aidl-format.sh
index 61c900d..ab9e207 100755
--- a/aidl-format.sh
+++ b/aidl-format.sh
@@ -73,7 +73,7 @@
       local input="$1"
       local style="$2"
       local temp="$(mktemp)"
-      local styletext="$([ -n "$style" ] && cat "$style" | tr '\n' ',' 2> /dev/null)"
+      local styletext="$([ -f "$style" ] && cat "$style" | tr '\n' ',' 2> /dev/null)"
       cat "$input" | clang-format \
         --style='{BasedOnStyle: Google,
         ColumnLimit: 100,