Skip to content

Commit ae95393

Browse files
committed
Make pip prefix configurable
The previous, hard-coded setting broke the installation of some pip packages, which probably used the --prefix value for some purpose it wasn't intended for.
1 parent 238ddaa commit ae95393

1 file changed

Lines changed: 3 additions & 3 deletions

File tree

linuxdeploy-plugin-conda.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@ show_usage() {
1818
echo " CONDA_CHANNELS=\"channelA;channelB;...\""
1919
echo " CONDA_PACKAGES=\"packageA;packageB;...\""
2020
echo " CONDA_PYTHON_VERSION=\"3.6\""
21+
echo " PIP_REQUIREMENTS=\"packageA packageB -r requirements.txt -e git+https://...\""
22+
echo " PIP_PREFIX=\"AppDir/usr/share/conda\""
2123
}
2224

2325
APPDIR=
@@ -111,9 +113,7 @@ if [ "$PIP_REQUIREMENTS" != "" ]; then
111113
pushd "$PIP_WORKDIR"
112114
fi
113115

114-
# add verbose flag if requested
115-
pip install -U $PIP_REQUIREMENTS --prefix="$APPDIR"/usr/conda/ ${PIP_VERBOSE:+-v}
116-
116+
pip install -U $PIP_REQUIREMENTS ${PIP_PREFIX:+--prefix=$PIP_PREFIX} ${PIP_VERBOSE:+-v}
117117

118118
if [ "$PIP_WORKDIR" != "" ]; then
119119
popd

0 commit comments

Comments
 (0)