Resolve conflicts and merge

bin/private/asdf-exec

@@ -20,13 +20,23 @@ IFS=':' read -a version_info <<< "$full_version"
 if [ "${version_info[0]}" = "tag" ] || [ "${version_info[0]}" = "commit" ]; then
   install_type="${version_info[0]}"
   version="${version_info[1]}"
+  install_path=$(get_install_path $plugin_name $install_type $version)
+elif [ "${version_info[0]}" = "path" ]; then
+  # This is for people who have the local source already compiled
+  # Like those who work on the language, etc
+  # We'll allow specifying path:/foo/bar/project in .tool-versions
+  # And then use the binaries there
+  install_type="path"
+  version="path"
+  install_path="${version_info[1]}"
 else
   install_type="version"
   version="${version_info[0]}"
+  install_path=$(get_install_path $plugin_name $install_type $version)
 fi
 
-install_path=$(get_install_path $plugin_name $install_type $version)
 
+install_path=$(get_install_path $plugin_name $install_type $version)
 
 if [ ! -f ${install_path}/${executable_path} ]; then
   echo "No such command in $full_version of $plugin_name"
@@ -35,9 +45,8 @@ fi
 
 
 if [ -f ${plugin_path}/bin/exec-env ]; then
-  exec_env=$(${plugin_path}/bin/exec-env $install_type $version $install_path)
   (
-    eval export ${exec_env};
+    . ${plugin_path}/bin/exec-env $install_type $version $install_path
     ${install_path}/${executable_path} "${@:3}"
     exit $?
   )

lib/commands/reshim.sh

@@ -40,7 +40,7 @@ write_shim_script() {
   local executable_path=$3
   local shim_path=$(asdf_dir)/shims/$(basename $executable_path)
 
-  echo """#!/usr/bin/env sh
+  echo """#!/usr/bin/env bash
 $(asdf_dir)/bin/private/asdf-exec ${package_name} ${executable_path} \"\$@\"
 """ > $shim_path