Skip to content

Commit 6d6ae64

Browse files
committed
replace --copy with --always copy for mamba v2.0
1 parent 106a8a3 commit 6d6ae64

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

installers/conda/linux/create_tarball.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -129,11 +129,11 @@ fi
129129
# Create base directory.
130130
mkdir -p "$bundle_contents"
131131

132-
# Create conda environment internally. --copy ensures no symlinks are used
132+
# Create conda environment internally. --always-copy ensures no symlinks are used
133133
bundle_conda_prefix="$bundle_contents"
134134

135135
echo "Creating Conda environment in '$bundle_conda_prefix'"
136-
"$CONDA_EXE" create --quiet --prefix "$bundle_conda_prefix" --copy \
136+
"$CONDA_EXE" create --quiet --prefix "$bundle_conda_prefix" --always-copy \
137137
--channel "$conda_channel" --channel conda-forge --yes \
138138
mantidworkbench \
139139
jq # used for processing the version string

installers/conda/osx/create_bundle.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -197,12 +197,12 @@ fi
197197
mkdir -p "$bundle_contents"/{Resources,MacOS}
198198

199199
# Create conda environment internally.
200-
# --copy ensures no symlinks are used
200+
# --always-copy ensures no symlinks are used
201201
# --platform osx-64 is required to allow ARM-based systems to install the osx-64 mantid packages.
202202
bundle_conda_prefix="$bundle_contents"/Resources
203203

204204
echo "Creating Conda environment in '$bundle_conda_prefix'"
205-
"$CONDA_EXE" create --quiet --prefix "$bundle_conda_prefix" --copy --platform osx-64 \
205+
"$CONDA_EXE" create --quiet --prefix "$bundle_conda_prefix" --always-copy --platform osx-64 \
206206
--channel "$conda_channel" --channel conda-forge --yes \
207207
mantidworkbench \
208208
jq # used for processing the version string

installers/conda/win/create_package.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ mkdir $COPY_DIR
7474

7575
echo "Creating conda env from mantidworkbench and jq"
7676
"$CONDA_EXE" create --prefix $CONDA_ENV_PATH \
77-
--copy --channel $CONDA_CHANNEL --channel conda-forge -y \
77+
--always-copy --channel $CONDA_CHANNEL --channel conda-forge -y \
7878
mantidworkbench \
7979
m2w64-jq
8080
echo "Conda env created"

0 commit comments

Comments
 (0)