From b774115d207bf1a5e3182e08e16f02a49c798604 Mon Sep 17 00:00:00 2001 From: mars Date: Sat, 26 Nov 2022 22:03:51 -0700 Subject: [PATCH] Hacky e-flag manipulation to catch tomcat errors --- check_licenses.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/check_licenses.sh b/check_licenses.sh index 9dc761d..f06bcd6 100755 --- a/check_licenses.sh +++ b/check_licenses.sh @@ -13,11 +13,14 @@ dir="$(pwd | sed 's/\//\n/g' | tail -n 1)" for toml in $(find "$PWD" -name "Cargo.toml"); do printf "Project: %s\n" "$(tomcat package.name "$toml")" - if [ "$(toml_lic="$(tomcat package.license "$toml" && printf "%s\n" "$?")")" = "0" ]; then + set +e # disable error propogation to catch tomcat exit code + toml_lic="$(tomcat package.license "$toml")" + if ! [ "$?" = "0" ]; then printf "%s: Missing license information\n" "$(printf "%s\n" "$toml" |\ sed "s/^.\+$dir\///g")" continue fi + set -e # re-enable error propogation for the rest of the script for file in $(find "$(printf "%s\n" "$toml" |\ sed 's/Cargo\.toml/src/g')" -name "*.rs")