From f1464ce274d5cca1b406adbea3b221101b5f73d4 Mon Sep 17 00:00:00 2001 From: James Lamb Date: Mon, 13 May 2024 15:03:03 -0500 Subject: [PATCH] refactor, add -eou pipefail --- tools/rapids-configure-conda-channels | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/tools/rapids-configure-conda-channels b/tools/rapids-configure-conda-channels index a4d913e..60bf7fc 100755 --- a/tools/rapids-configure-conda-channels +++ b/tools/rapids-configure-conda-channels @@ -1,10 +1,12 @@ #!/bin/bash # A utility script that configures conda channels +set -euo pipefail + conda_channel_in_config() { channel_id=${1:?err} conda config --json --get channels \ - | jq -r --arg c "${channel_id}" '."get"."channels" | any(. == $c )' + | channel_id="${channel_id}" jq -r --exit-status '.get.channels | any(. == env.channel_id )' } # Only try to run 'conda config --remove' if the channel exists in the config. @@ -12,7 +14,7 @@ conda_channel_in_config() { remove_conda_channel() { channel_id=${1:?err} in_config=$(conda_channel_in_config "${channel_id}") - if [[ "${in_config}" == "true" ]]; then + if conda_channel_in_config "${channel_id}" > /dev/null; then conda config --system --remove channels "${channel_id}" else echo "[rapids-configure-conda-channels] channel '${channel_id}' not found via 'conda config --get channels'"