Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix/windows subtool suffix #154

Merged
merged 2 commits into from
Jan 10, 2018
Merged

Fix/windows subtool suffix #154

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
41bf6c7
Fix subtool detection on Windows
djdv Jan 9, 2018
ae64f8a
Don't manually compare variable error string
djdv Jan 9, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 32 additions & 9 deletions gxutil/pm.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,14 @@ const GxVersion = "0.12.1"
const PkgFileName = "package.json"

var installPathsCache map[string]string
var binarySuffix string

func init() {
installPathsCache = make(map[string]string)

if runtime.GOOS == "windows" {
binarySuffix = ".exe"
}
}

type PM struct {
Expand Down Expand Up @@ -669,20 +674,19 @@ func getSubtoolPath(env string) (string, error) {
return "", nil
}

var suffix string
if runtime.GOOS == "windows" {
suffix = ".exe"
}

binname := "gx-" + env + suffix
binname := "gx-" + env + binarySuffix
_, err := exec.LookPath(binname)
if err != nil {
if !strings.Contains(err.Error(), "file not found") {
if eErr, ok := err.(*exec.Error); ok {
if eErr.Err != exec.ErrNotFound {
return "", err
}
} else {
return "", err
}

if strings.HasSuffix(os.Args[0], "/gx") {
nearBin := os.Args[0] + "-" + env + suffix
if calledWithPathSeparator() {
nearBin := strings.TrimSuffix(os.Args[0], binarySuffix) + "-" + env + binarySuffix
if _, err := os.Stat(nearBin); err != nil {
VLog("subtool_exec: No gx helper tool found for", env)
return "", nil
Expand All @@ -696,6 +700,25 @@ func getSubtoolPath(env string) (string, error) {
return binname, nil
}

func calledWithPathSeparator() bool {
trimmedArg := strings.TrimSuffix(os.Args[0], binarySuffix)
if trimmedArg == "gx" {
return false
}

if runtime.GOOS == "windows" {
if strings.HasSuffix(trimmedArg, (string(os.PathSeparator)+"gx")) || strings.HasSuffix(trimmedArg, "/gx") {
return true
}
} else {
if strings.HasSuffix(trimmedArg, (string(os.PathSeparator) + "gx")) {
return true
}
}

return false
}

func TryRunHook(hook, env string, req bool, args ...string) error {
binname, err := getSubtoolPath(env)
if err != nil {
Expand Down