Merge pull request #170 from lsst/tickets/DM-37324

DM-37324: Update to rubin-env 5.1.0.
lsst · Dec 14, 2022 · 88dc87f · 88dc87f
2 parents cf00be4 + 47a7706
commit 88dc87f
Showing 1 changed file with 7 additions and 8 deletions.
diff --git a/scripts/newinstall.sh b/scripts/newinstall.sh
@@ -18,7 +18,7 @@ LSST_EUPS_USE_EUPSPKG=${LSST_EUPS_USE_EUPSPKG:-true}
 LSST_MINICONDA_VERSION=${LSST_MINICONDA_VERSION:-py38_4.9.2}
 # this git ref controls which set of conda packages are used to initialize the
 # the default conda env defined in scipipe_conda_env git package (RFC-553).
-LSST_SPLENV_REF=${LSST_SPLENV_REF:-${LSST_LSSTSW_REF:-5.0.0}}
+LSST_SPLENV_REF=${LSST_SPLENV_REF:-${LSST_LSSTSW_REF:-5.1.0}}
 LSST_MINICONDA_BASE_URL=${LSST_MINICONDA_BASE_URL:-https://repo.continuum.io/miniconda}
 LSST_CONDA_CHANNELS=${LSST_CONDA_CHANNELS:-"conda-forge"}
 LSST_CONDA_ENV_NAME=${LSST_CONDA_ENV_NAME:-lsst-scipipe-${LSST_SPLENV_REF}}
@@ -623,7 +623,6 @@ n8l::conda_check() {
 					EOF
 				} | n8l::fmt
 				n8l::fail
-				break;
 				;;
 			* ) echo "Please answer yes or no.";;
 		esac
@@ -1013,16 +1012,16 @@ n8l::main() {
 	if [[ $PRESERVE_EUPS_PKGROOT_FLAG == true ]]; then
 		EUPS_PKGROOT=${EUPS_PKGROOT:-$(
 			n8l::default_eups_pkgroot \
-				$LSST_EUPS_USE_EUPSPKG \
-				$LSST_EUPS_USE_TARBALLS \
-				$LSST_USE_CONDA_SYSTEM
+				"$LSST_EUPS_USE_EUPSPKG" \
+				"$LSST_EUPS_USE_TARBALLS" \
+				"$LSST_USE_CONDA_SYSTEM"
 		)}
 	else
 		EUPS_PKGROOT=$(
 			n8l::default_eups_pkgroot \
-				$LSST_EUPS_USE_EUPSPKG \
-				$LSST_EUPS_USE_TARBALLS \
-				$LSST_USE_CONDA_SYSTEM
+				"$LSST_EUPS_USE_EUPSPKG" \
+				"$LSST_EUPS_USE_TARBALLS" \
+				"$LSST_USE_CONDA_SYSTEM"
 		)
 	fi