diff options
author | Chase Qi <chase.qi@linaro.org> | 2019-03-25 11:41:55 +0800 |
---|---|---|
committer | Chase Qi <chase.qi@linaro.org> | 2019-03-25 11:49:29 +0800 |
commit | 9a5f4cf42fedfb58a88dd3b595570b311152691b (patch) | |
tree | 89db1ea9a1965aec0467af2cd66451943b570c58 | |
parent | dc5d4f40f380580fb22306748ed97ef866e97864 (diff) |
validate.py: force check all files end with .sh
When shebang line is incorrect, python-magic returns file type as
plain/text, then sanity check will be skipped. This patch treat all
files end with .sh as shell script and do force shellcheck test.
Signed-off-by: Chase Qi <chase.qi@linaro.org>
-rwxr-xr-x | validate.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/validate.py b/validate.py index 1d6d2ed..6bf199f 100755 --- a/validate.py +++ b/validate.py @@ -37,6 +37,7 @@ def publish_result(result_message_list, args): f.write("\n\n") f.close() except IOError as e: + print(e) print_stderr("Cannot write to result file: %s" % args.result_file) print_stderr(result_message) @@ -207,7 +208,7 @@ def validate_file(args, path): filetype = magic.from_file(path, mime=True) exitcode = 0 # libmagic takes yaml as 'text/plain', so use file extension here. - if path.endswith((".yaml", "yml")): + if path.endswith((".yaml", ".yml")): exitcode = validate_yaml(path, args) if exitcode == 0: # if yaml isn't valid there is no point in checking metadata @@ -216,7 +217,7 @@ def validate_file(args, path): exitcode = pycodestyle_check(path, args) elif filetype == "text/x-php": exitcode = validate_php(path, args) - elif filetype == "text/x-shellscript": + elif path.endswith('.sh') or filetype == "text/x-shellscript": exitcode = validate_shell(path, args) else: publish_result(["* UNKNOWN [SKIPPED]: " + path + " - Unknown file type detected: " + filetype], args) |