Fix posix script legacy asdf detection

Partially revert 098aacf

Author: lukaszsamson

scripts/launch.fish

@@ -29,31 +29,39 @@ if test -n "$asdf"
         set -gx PATH "$ASDF_DATA_DIR/shims" $PATH
     end
 else
-    echo "asdf not found" >&2
-    echo "Looking for mise executable" >&2
-
-    set mise (which mise)
-    if test -n "$mise"
-        echo "mise executable found at $mise, activating" >&2
-        source ( "$mise" env -s fish )
+    # Fallback to old method for asdf version <= 0.15.x
+    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
+        # Source the old asdf.sh script for versions <= 0.15.0
+        source "$ASDF_SH"
     else
-        echo "mise not found" >&2
-        echo "Looking for rtx executable" >&2
+        echo "asdf not found" >&2
+        echo "Looking for mise executable" >&2
 
-        set rtx (which rtx)
-        if test -n "$rtx"
-            echo "rtx executable found at $rtx, activating" >&2
-            source ( "$rtx" env -s fish )
+        set mise (which mise)
+        if test -n "$mise"
+            echo "mise executable found at $mise, activating" >&2
+            source ( "$mise" env -s fish )
         else
-            echo "rtx not found" >&2
-            echo "Looking for vfox executable" >&2
+            echo "mise not found" >&2
+            echo "Looking for rtx executable" >&2
 
-            set vfox (which vfox)
-            if test -n "$vfox"
-                echo "vfox executable found at $vfox, activating" >&2
-                source ( "$vfox" activate fish )
+            set rtx (which rtx)
+            if test -n "$rtx"
+                echo "rtx executable found at $rtx, activating" >&2
+                source ( "$rtx" env -s fish )
             else
-                echo "vfox not found" >&2
+                echo "rtx not found" >&2
+                echo "Looking for vfox executable" >&2
+
+                set vfox (which vfox)
+                if test -n "$vfox"
+                    echo "vfox executable found at $vfox, activating" >&2
+                    source ( "$vfox" activate fish )
+                else
+                    echo "vfox not found" >&2
+                end
             end
         end
     end

scripts/launch.sh

@@ -41,13 +41,29 @@ 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
-    >&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"
+    asdf_version=$(asdf --version 2>/dev/null)
+    version=$(echo "$asdf_version" | grep -Eo '[0-9]+\.[0-9]+\.[0-9]+')
+    major=$(echo "$version" | cut -d. -f1)
+    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_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"
+            # Source the old asdf.sh script for versions <= 0.15.0
+            . "$ASDF_SH"
+        else
+            >&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"
+    fi
 else
     # Fallback to old method for version <= 0.15.x
-    ASDF_SH="${ASDF_DIR}/asdf.sh"       # Path to the old shell script for version <= 0.15.x
+    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"
         # Source the old asdf.sh script for versions <= 0.15.0