From 708fe24d71ee54af65f0819bc439b95b30641fc8 Mon Sep 17 00:00:00 2001 From: Michael Hucka Date: Sat, 22 Feb 2025 19:31:20 -0800 Subject: [PATCH] Explicitly set -e in $(...) commands Using the added `.shellcheckrc` options of PR #7079, the `shellcheck` program flagged a couple of places where the effects of the `set -e` at the beginning of this script would not have the expected effect. --- dev_tools/packaging/produce-package.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dev_tools/packaging/produce-package.sh b/dev_tools/packaging/produce-package.sh index 1b12b550bc3..35e4f5927b6 100755 --- a/dev_tools/packaging/produce-package.sh +++ b/dev_tools/packaging/produce-package.sh @@ -58,14 +58,14 @@ echo "Creating pristine repository clone at ${tmp_git_dir}" git clone --shared --quiet "${repo_dir}" "${tmp_git_dir}" cd "${tmp_git_dir}" if [ -n "${SPECIFIED_VERSION}" ]; then - CURRENT_VERSION=$(my_dev_tools_modules print_version) + CURRENT_VERSION=$(set -e; my_dev_tools_modules print_version) my_dev_tools_modules replace_version --old="${CURRENT_VERSION}" --new="${SPECIFIED_VERSION}" fi # Python 3 wheel. echo "Producing python 3 package files." -CIRQ_MODULES=$(my_dev_tools_modules list --mode folder --include-parent) +CIRQ_MODULES=$(set -e; my_dev_tools_modules list --mode folder --include-parent) for m in $CIRQ_MODULES; do echo "processing $m/setup.py..."