Merge branch 'ubuntuegor-master'

Author: Stratus3D

internal/cli/cli.go

@@ -521,6 +521,8 @@ func envCommand(logger *log.Logger, shimmedCommand string, args []string) error
 		"PATH":                 setPath(execPaths),
 	}
 
+	env = execenv.MergeEnv(execenv.SliceToMap(os.Environ()), env)
+
 	if parsedVersion.Type != "system" {
 		env, err = execenv.Generate(plugin, env)
 		if _, ok := err.(plugins.NoCallbackError); !ok && err != nil {
@@ -579,15 +581,15 @@ func execCommand(logger *log.Logger, command string, args []string) error {
 		"PATH":                 setPath(execPaths),
 	}
 
+	env = execenv.MergeEnv(execenv.SliceToMap(os.Environ()), env)
+
 	if parsedVersion.Type != "system" {
 		env, err = execenv.Generate(plugin, env)
 		if _, ok := err.(plugins.NoCallbackError); !ok && err != nil {
 			return err
 		}
 	}
 
-	env = execenv.MergeEnv(execenv.SliceToMap(os.Environ()), env)
-
 	err = hook.RunWithOutput(conf, fmt.Sprintf("pre_%s_%s", plugin.Name, filepath.Base(executable)), args, os.Stdout, os.Stderr)
 	if err != nil {
 		os.Exit(1)

test/shim_env_command.bats

@@ -47,6 +47,21 @@ teardown() {
   echo "$output" | grep 'FOO=bar'
 }
 
+@test "asdf env should pass through any already defined environment variables to a shim" {
+  echo "dummy 1.0" >"$PROJECT_DIR/.tool-versions"
+  export MYTESTENV=exec-env-pass-through
+  run asdf install
+
+  echo '#!/usr/bin/env bash
+  export FOO=bar' >"$ASDF_DIR/plugins/dummy/bin/exec-env"
+  chmod +x "$ASDF_DIR/plugins/dummy/bin/exec-env"
+
+  run asdf env dummy
+  [ "$status" -eq 0 ]
+  echo "$output" | grep 'FOO=bar'
+  echo "$output" | grep 'MYTESTENV=exec-env-pass-through'
+}
+
 @test "asdf env should print error when plugin version lacks the specified executable" {
   echo "dummy 1.0" >"$PROJECT_DIR/.tool-versions"
   run asdf install