From 7cd1d422c72f8ae0f0b9d8b312e113c3110c29a7 Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Wed, 13 Nov 2024 13:05:49 -0800 Subject: Don't use echo -e A rule that uses echo -e may execute in a dash shell instead of bash when running on the build servers. The dash echo builtin is posix compliant, and does not treat -e as an option[1]. Replace all uses of echo -e with echo if it does not need escape sequences, or printf if it does. [1] https://wiki.ubuntu.com/DashAsBinSh#echo Bug: 378931009 Test: manual Change-Id: I2974f59ea10a613bc3bd36e3591fd81f38a1769a --- apex/apex_singleton.go | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'apex/apex_singleton.go') diff --git a/apex/apex_singleton.go b/apex/apex_singleton.go index 00dd44648..d46104e40 100644 --- a/apex/apex_singleton.go +++ b/apex/apex_singleton.go @@ -64,12 +64,14 @@ var ( if grep -v -h '^#' ${allowed_deps_list} | sort -u -f| diff -B -u - ${new_allowed_deps}; then touch ${out}; else - echo -e "\n******************************"; + echo; + echo "******************************"; echo "ERROR: go/apex-allowed-deps-error contains more information"; echo "******************************"; echo "Detected changes to allowed dependencies in updatable modules."; echo "To fix and update packages/modules/common/build/allowed_deps.txt, please run:"; - echo -e "$$ (croot && packages/modules/common/build/update-apex-allowed-deps.sh)\n"; + echo "$$ (croot && packages/modules/common/build/update-apex-allowed-deps.sh)"; + echo; echo "When submitting the generated CL, you must include the following information"; echo "in the commit message if you are adding a new dependency:"; echo "Apex-Size-Increase: Expected binary size increase for affected APEXes (or the size of the .jar / .so file of the new library)"; @@ -78,7 +80,8 @@ var ( echo "Test-Info: What’s the testing strategy for the new dependency? Does it have its own tests, and are you adding integration tests? How/when are the tests run?"; echo "You do not need OWNERS approval to submit the change, but mainline-modularization@"; echo "will periodically review additions and may require changes."; - echo -e "******************************\n"; + echo "******************************"; + echo; exit 1; fi; `, -- cgit v1.2.3-59-g8ed1b