From de410b157715c969f8bba1533ae25fa07ef033e3 Mon Sep 17 00:00:00 2001
From: Paul Walker <paul@blacksun.org.uk>
Date: Thu, 13 Feb 2025 22:30:26 +0000
Subject: [PATCH] Detect and use 'new-style' asdf if it's in ~/bin

---
 bashrc.d/asdf.bash | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/bashrc.d/asdf.bash b/bashrc.d/asdf.bash
index 8548f2c..4814419 100644
--- a/bashrc.d/asdf.bash
+++ b/bashrc.d/asdf.bash
@@ -1,11 +1,8 @@
-if [ -d "$HOME/.asdf" ] ; then
-  ASDF_DATA_DIR=$HOME/.asdf
-
-  # Pre-0.16.0
-  # if [ -f "$ASDF_DATA_DIR/asdf.sh" ] ; then
-    # . "$HOME/.asdf/asdf.sh"
-    # . "$HOME/.asdf/completions/asdf.bash"
-  # fi
-
-  addpath $ASDF_DATA_DIR/shims
+if [ -x "$HOME/bin/asdf" ] ; then
+  export ASDF_DATA_DIR="$HOME/.asdf"
+  mkdir -p "$ASDF_DATA_DIR"
+  addpath "$ASDF_DATA_DIR/shims"
+elif [ -d "$HOME/.asdf" ] ; then
+  . "$HOME/.asdf/asdf.sh"
+  . "$HOME/.asdf/completions/asdf.bash"
 fi