From e00c383c6c15161d0ece018caa49306e56878cc4 Mon Sep 17 00:00:00 2001 From: Brendt Wohlberg Date: Thu, 14 Dec 2023 17:24:06 -0700 Subject: [PATCH] Debugging --- misc/conda/make_conda_env.sh | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/misc/conda/make_conda_env.sh b/misc/conda/make_conda_env.sh index 9ea4f9f28..e8f734c1b 100755 --- a/misc/conda/make_conda_env.sh +++ b/misc/conda/make_conda_env.sh @@ -163,7 +163,7 @@ for nc in $NOCONDA; do # Escape [ and ] for use in regex nc=$(echo $nc | $SED -E 's/(\[|\])/\\\1/g') # Add package to pip package list - PIPREQ="$PIPREQ "$(grep "$nc" $FLTREQUIRE) + PIPREQ="$PIPREQ "$(grep "$nc" $FLTREQUIRE | $SED 's/\\//g') # Remove package $nc from conda package list $SED -i "/^$nc.*\$/d" $FLTREQUIRE done @@ -176,8 +176,7 @@ if [ "$VERBOSE" == "yes" ]; then echo "Packages to be installed via conda:" echo " $CONDAREQ" | fmt -w 79 echo "Packages to be installed via pip:" - PIPREQSED=$(echo $PIPREQ | $SED 's/\\//g') - echo " jaxlib==$JLVER jax==$JXVER $PIPREQSED" | fmt -w 79 + echo " jaxlib==$JLVER jax==$JXVER $PIPREQ" | fmt -w 79 if [ "$TEST" == "yes" ]; then exit 0 fi