diff --git a/scripts/dbt-create-spack.sh b/scripts/dbt-create-spack.sh index 86d9b16..7e96e92 100755 --- a/scripts/dbt-create-spack.sh +++ b/scripts/dbt-create-spack.sh @@ -49,10 +49,6 @@ else echo -e "INFO [`eval $timenow`]: creating a local spack instance under ${LOCAL_SPACK_DIR}. " existing_spack_dir=$( realpath $SPACK_RELEASES_DIR/$SPACK_RELEASE/spack-installation 2>/dev/null ) - if [[ -z $existing_spack_dir ]]; then # Backwards compatibility with the old directory structure - existing_spack_dir=$( realpath $SPACK_RELEASES_DIR/$SPACK_RELEASE/default/spack-installation ) - fi - stack_new_spack $existing_spack_dir $LOCAL_SPACK_DIR fi diff --git a/scripts/dbt-setup-tools.sh b/scripts/dbt-setup-tools.sh index 14c7c5b..b10920a 100644 --- a/scripts/dbt-setup-tools.sh +++ b/scripts/dbt-setup-tools.sh @@ -190,9 +190,6 @@ function spack_setup_env() { local spack_setup_script="" if [[ -z $LOCAL_SPACK_DIR ]]; then spack_setup_script=$( realpath $SPACK_RELEASES_DIR/$SPACK_RELEASE/spack-installation/share/spack/setup-env.sh 2>/dev/null ) - if [[ -z $spack_setup_script ]]; then # Backwards compatibility with the old directory structure - spack_setup_script=$( realpath $SPACK_RELEASES_DIR/$SPACK_RELEASE/default/spack-installation/share/spack/setup-env.sh ) - fi else echo -e "${COL_GREEN}Local spack directory is set, loading...${COL_RESET}\n"