forked from shyiko/jabba
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Refactored `use` command to improve usability by introducing a `GetVars` function that returns the functions to be exported for use by `exec`. Implemented an `exec` that simply passes the args as-is to the specified binary via `syscall.Exec`. Fixes shyiko#285
- Loading branch information
Showing
5 changed files
with
135 additions
and
48 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,38 @@ | ||
| package command | ||
|
|
||
| import ( | ||
| "os" | ||
| "os/exec" | ||
| "path/filepath" | ||
| "syscall" | ||
|
|
||
| "github.com/shyiko/jabba/cfg" | ||
| ) | ||
|
|
||
| func Exec(selector string, command string, commandArgs []string) error { | ||
| aliasValue := GetAlias(selector) | ||
| if aliasValue != "" { | ||
| selector = aliasValue | ||
| } | ||
| ver, err := LsBestMatch(selector) | ||
| if err != nil { | ||
| return err | ||
| } | ||
|
|
||
| vars, err := GetVars(filepath.Join(cfg.Dir(), "jdk", ver)) | ||
| if err != nil { | ||
| return err | ||
| } | ||
|
|
||
| for variableName, variableValue := range vars { | ||
| os.Setenv(variableName, variableValue) | ||
| } | ||
|
|
||
| binary, err := exec.LookPath(command) | ||
| if err != nil { | ||
| return err | ||
| } | ||
|
|
||
| err = syscall.Exec(binary, commandArgs, os.Environ()) | ||
| return err | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters