Create get_custom_executable_path function to hold the custom exec path logic

Stratus3D · Stratus3D · commit c37307a2cc18 · 2019-01-05T10:23:41.000-05:00
diff --git a/bin/private/asdf-exec b/bin/private/asdf-exec
@@ -27,11 +27,7 @@ for version in "${versions[@]}"; do
     exit 127
   fi
 
-  # custom plugin hook for executable path
-  if [ -f "${plugin_path}/bin/exec-path" ]; then
-    cmd=$(basename "$executable_path")
-    executable_path="$("${plugin_path}/bin/exec-path" "$install_path" "$cmd" "$executable_path")"
-  fi
+  executable_path=$(get_custom_executable_path "$plugin_path" "$install_path" "$executable_path")
 
   if full_executable_path=$(get_executable_path "$plugin_name" "$version" "$executable_path"); then
     if [ -f "$full_executable_path" ]; then
diff --git a/lib/commands/which.sh b/lib/commands/which.sh
@@ -12,13 +12,11 @@ which_command() {
         if [ "$version" = "system" ]; then
           continue
         fi
-        if [ -f "${plugin_path}/bin/exec-path" ]; then
-          cmd=$(basename "$executable_path")
-          install_path=$(find_install_path "$plugin_name" "$version")
-          executable_path="$("${plugin_path}/bin/exec-path" "$install_path" "$cmd" "$executable_path")"
-        fi
+
+        executable_path="$(get_custom_executable_path "$plugin_path" "$install_path" "$executable_path")"
         full_executable_path=$(get_executable_path "$plugin_name" "$version" "$executable_path")
         location=$(find -L "$full_executable_path" -maxdepth 4 -name "$command" -type f -perm -u+x | sed -e 's|//|/|g')
+
         if [ -n "$location" ]; then
           echo "$location"
           not_found=0
diff --git a/lib/utils.sh b/lib/utils.sh
@@ -220,6 +220,20 @@ find_install_path() {
   fi
 }
 
+get_custom_executable_path() {
+  local plugin_path=$1
+  local install_path=$2
+  local executable_path=$3
+
+  # custom plugin hook for executable path
+  if [ -f "${plugin_path}/bin/exec-path" ]; then
+    cmd=$(basename "$executable_path")
+    executable_path="$("${plugin_path}/bin/exec-path" "$install_path" "$cmd" "$executable_path")"
+  fi
+
+  echo $executable_path
+}
+
 get_executable_path() {
   local plugin_name=$1
   local version=$2
