do not overwrite user environment variables on asdf 0.16+

Author: lukaszsamson

scripts/launch.fish

@@ -9,7 +9,6 @@
 # First order of business, see whether we can setup asdf
 
 echo "Looking for asdf install" >&2
-test -n "$ASDF_DIR"; or set ASDF_DIR "$HOME/.asdf"
 
 # Check if we have the asdf binary for version >= 0.16.0
 set asdf (which asdf)
@@ -18,18 +17,17 @@ if test -n "$asdf"
     set semver (string match -r '(\d+)\.(\d+)\.(\d+)' $asdf_version)
     if test $semver[2] -eq 0 -a $semver[3] -lt 16
         # Fallback to old method for asdf version <= 0.15.x
+        test -n "$ASDF_DIR"; or set ASDF_DIR "$HOME/.asdf"
         set ASDF_SH "$ASDF_DIR/asdf.fish"
         echo "Legacy pre v0.16.0 asdf install found at $ASDF_SH, sourcing" >&2
         # Source the old asdf.sh script for versions <= 0.15.0
         source "$ASDF_SH"
     else
-        echo "asdf executable found at $asdf. Setting ASDF_DIR=$ASDF_DIR and adding $ASDF_DIR/shims to PATH." >&2
-        # If the binary is found, set up environment for newer asdf versions
-        set -gx ASDF_DATA_DIR "$ASDF_DIR"
-        set -gx PATH "$ASDF_DATA_DIR/shims" $PATH
+        echo "asdf executable found at $asdf. Using ASDF_DIR=$ASDF_DIR, ASDF_DATA_DIR=$ASDF_DATA_DIR." >&2
     end
 else
     # Fallback to old method for asdf version <= 0.15.x
+    test -n "$ASDF_DIR"; or set ASDF_DIR "$HOME/.asdf"
     set ASDF_SH "$ASDF_DIR/asdf.fish"
     if test -f "$ASDF_SH"
         echo "Legacy pre v0.16.0 asdf install found at $ASDF_SH, sourcing" >&2

scripts/launch.sh

@@ -37,7 +37,6 @@ esac
 
 # First order of business, see whether we can setup asdf
 echo "Looking for asdf install" >&2
-ASDF_DIR=${ASDF_DIR:-"${HOME}/.asdf"}
 
 # Check if we have the asdf binary for version >= 0.16.0
 if command -v asdf >/dev/null 2>&1; then
@@ -47,6 +46,7 @@ if command -v asdf >/dev/null 2>&1; then
     minor=$(echo "$version" | cut -d. -f2)
     # If the version is less than 0.16.0 (i.e. major = 0 and minor < 16), use legacy method.
     if [ "$major" -eq 0 ] && [ "$minor" -lt 16 ]; then
+        ASDF_DIR=${ASDF_DIR:-"${HOME}/.asdf"}
         ASDF_SH="${ASDF_DIR}/asdf.sh"
         if test -f "$ASDF_SH"; then
             >&2 echo "Legacy pre v0.16.0 asdf install found at $ASDF_SH, sourcing"
@@ -56,13 +56,11 @@ if command -v asdf >/dev/null 2>&1; then
             >&2 echo "Legacy asdf not found at $ASDF_SH"
         fi
     else
-        >&2 echo "asdf executable found at $(command -v asdf). Setting ASDF_DIR=${ASDF_DIR} and adding ${ASDF_DIR}/shims to PATH."
-        # If the binary is found, set up environment for newer asdf versions
-        export ASDF_DATA_DIR="$ASDF_DIR"
-        export PATH="$ASDF_DATA_DIR/shims:$PATH"
+        >&2 echo "asdf executable found at $(command -v asdf). Using ASDF_DIR=${ASDF_DIR}, ASDF_DATA_DIR=${ASDF_DATA_DIR}."
     fi
 else
     # Fallback to old method for version <= 0.15.x
+    ASDF_DIR=${ASDF_DIR:-"${HOME}/.asdf"}
     ASDF_SH="${ASDF_DIR}/asdf.sh"
     if test -f "$ASDF_SH"; then
         >&2 echo "Legacy pre v0.16.0 asdf install found at $ASDF_SH, sourcing"