From 0d3d8e40c14e7816aba26cb598895a8c53e74feb Mon Sep 17 00:00:00 2001 From: Bob Badour Date: Fri, 20 Mar 2020 19:35:48 -0700 Subject: [PATCH] More fix for -e Not sure whether sort, tr or xargs returning non-zero status, but one of them sometimes does. Test: manually Change-Id: I8f2b862de9d6e22dd90068252e393533ec992dfd --- scripts/transitive-deps.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/scripts/transitive-deps.sh b/scripts/transitive-deps.sh index 23121c6b7..c6f8b76e4 100755 --- a/scripts/transitive-deps.sh +++ b/scripts/transitive-deps.sh @@ -469,7 +469,9 @@ case "${notices_out}" in fi readonly hashedNotice="${tmpFiles}/hashednotices" ( # md5sum outputs checksum space indicator(space or *) filename newline + set +e sort -u "${allNotice}" | tr '\n' '\0' | xargs -0 -r md5sum 2>/dev/null + set -e # use sed to replace space and indicator with separator ) > "${hashedNotice}" if ${showProgress}; then