From 960f21c2c5bd9bf7dc053518dc11bd4bf021fa5f Mon Sep 17 00:00:00 2001
From: JP Ungaretti <19893438+jungaretti@users.noreply.github.com>
Date: Mon, 26 Sep 2022 10:50:13 -0700
Subject: Fix additional Python and JupyterLab edge case (#182)

* Remove bloat from JupyterLab test

* Check location of JupyterLab installation

* Remove common-utils

* Add failing additional with JL test

* Fix Python feature

* Update scenario images

* Bump patch version
---
 src/python/devcontainer-feature.json | 2 +-
 src/python/install.sh                | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/python/devcontainer-feature.json b/src/python/devcontainer-feature.json
index 6d28941..0c90e0b 100644
--- a/src/python/devcontainer-feature.json
+++ b/src/python/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
   "id": "python",
-  "version": "1.0.7",
+  "version": "1.0.8",
   "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 2a0dd55..3cf3a88 100755
--- a/src/python/install.sh
+++ b/src/python/install.sh
@@ -374,6 +374,7 @@ if [ "${PYTHON_VERSION}" != "none" ]; then
 
     # Additional python versions to be installed but not be set as default.
     if [ ! -z "${ADDITIONAL_VERSIONS}" ]; then
+        OLD_INSTALL_PATH="${INSTALL_PATH}"
         OLDIFS=$IFS
         IFS=","
             read -a additional_versions <<< "$ADDITIONAL_VERSIONS"
@@ -381,6 +382,7 @@ if [ "${PYTHON_VERSION}" != "none" ]; then
                 OVERRIDE_DEFAULT_VERSION="false"
                 install_python $version
             done
+        INSTALL_PATH="${OLD_INSTALL_PATH}"
         IFS=$OLDIFS
     fi
 
-- 
cgit v1.2.3