From ee754d10fa86020d296c70005621852e2873c803 Mon Sep 17 00:00:00 2001
From: Peter Tri Ho <mail@petertriho.com>
Date: Fri, 10 Jun 2022 12:37:56 +1000
Subject: [PATCH] fix(fish): `ASDF_DEFAULT_TOOL_VERSIONS_FILENAME` workaround
 no longer required

https://github.com/asdf-vm/asdf/issues/1082
---
 scripts/.local/bin/xfish | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/scripts/.local/bin/xfish b/scripts/.local/bin/xfish
index 8542aa64..7aa7e3fc 100755
--- a/scripts/.local/bin/xfish
+++ b/scripts/.local/bin/xfish
@@ -4,18 +4,10 @@ set -euo pipefail
 
 cmd="arch -x86_64 \\
 -e ASDF_DATA_DIR=\"$HOME/.asdf_x86\" \\
--e ASDF_DEFAULT_TOOL_VERSIONS_FILENAME=\"$HOME/.tool-versions-x86\" \\
+-e ASDF_DEFAULT_TOOL_VERSIONS_FILENAME=\".tool-versions-x86\" \\
 -e ASDF_NPM_DEFAULT_PACKAGES_FILE=\"$HOME/.default-npm-packages-x86\" \\
 -e ASDF_PYTHON_DEFAULT_PACKAGES_FILE=\"$HOME/.default-python-packages-x86\" \\
 -e DOCKER_DEFAULT_PLATFORM=linux/amd64 \\
 "
 
-if [[ -n $(asdf current nodejs 2>&1 | grep "$HOME/.tool-versions") ]]; then
-    cmd+=" -e ASDF_NODEJS_VERSION=$(grep "nodejs" "$HOME/.tool-versions-x86" | sed "s/nodejs *\(.*\)/\1/")"
-fi
-
-if [[ -n $(asdf current python 2>&1 | grep "$HOME/.tool-versions") ]]; then
-    cmd+=" -e ASDF_PYTHON_VERSION=$(grep "python" "$HOME/.tool-versions-x86" | sed "s/python *\(.*\)/\1/")"
-fi
-
 eval "$cmd /usr/local/bin/fish $*"