diff options
| author | Claudio Bandera <cbandera@users.noreply.github.com> | 2022-11-28 22:05:21 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-11-28 22:05:21 +0300 |
| commit | 4af4c291225a165e5a9b0e5a65c450e81e5aecf0 (patch) | |
| tree | d9cc6f51e00af763e992ee815f154a323ec2dce8 | |
| parent | 30f287605354478d4af5d6c8736c9a414369110c (diff) | |
Proposal for fix of #312 (#313)
* Proposal for fix of #312
This change moves the directory separator into the `PIPX_DIR` variable in order to not introduce an error in the case pipx has already been installed systemwide.
* Bump patch version of python feature to 1.0.16
| -rw-r--r-- | src/python/devcontainer-feature.json | 2 | ||||
| -rwxr-xr-x | src/python/install.sh | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/python/devcontainer-feature.json b/src/python/devcontainer-feature.json index b96511b..ca474ab 100644 --- a/src/python/devcontainer-feature.json +++ b/src/python/devcontainer-feature.json @@ -1,6 +1,6 @@ { "id": "python", - "version": "1.0.15", + "version": "1.0.16", "name": "Python", "documentationURL": "https://github.com/devcontainers/features/tree/main/src/python", "description": "Installs the provided version of Python, as well as PIPX, and other common Python utilities. JupyterLab is conditionally installed with the python feature. Note: May require source code compilation.", diff --git a/src/python/install.sh b/src/python/install.sh index d823cc9..0c3f9e0 100755 --- a/src/python/install.sh +++ b/src/python/install.sh @@ -450,11 +450,11 @@ if [[ "${INSTALL_PYTHON_TOOLS}" = "true" ]] && [[ $(python --version) != "" ]]; if ! type pipx > /dev/null 2>&1; then pip3 install --disable-pip-version-check --no-cache-dir --user pipx 2>&1 /tmp/pip-tmp/bin/pipx install --pip-args=--no-cache-dir pipx - PIPX_DIR="/tmp/pip-tmp/bin" + PIPX_DIR="/tmp/pip-tmp/bin/" fi for util in "${DEFAULT_UTILS[@]}"; do if ! type ${util} > /dev/null 2>&1; then - "${PIPX_DIR}/pipx" install --system-site-packages --pip-args '--no-cache-dir --force-reinstall' ${util} + "${PIPX_DIR}pipx" install --system-site-packages --pip-args '--no-cache-dir --force-reinstall' ${util} else echo "${util} already installed. Skipping." fi |