diff options
| author | Steve <nilslice@gmail.com> | 2017-02-22 14:28:14 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-02-22 14:28:14 -0800 |
| commit | 366a9e0a85cf1497b002f95f5ad6422b01e8148f (patch) | |
| tree | ebb88b516836484299f47a795d6f5b3eec83fe06 | |
| parent | e295f961e3e6e9add75086ab75cf90959cc890f5 (diff) | |
| parent | ae242b7f926b1fcbec36d66df8355f432219d1c9 (diff) | |
Merge pull request #84 from ponzu-cms/ponzu-dev
[core] fix path location for cross-platform compatibility
| -rw-r--r-- | cmd/ponzu/main.go | 3 | ||||
| -rw-r--r-- | cmd/ponzu/paths.go | 11 |
2 files changed, 1 insertions, 13 deletions
diff --git a/cmd/ponzu/main.go b/cmd/ponzu/main.go index c324a88..f44f626 100644 --- a/cmd/ponzu/main.go +++ b/cmd/ponzu/main.go @@ -147,9 +147,8 @@ func main() { services = "admin,api" } - path := buildOutputPath() name := buildOutputName() - buildPathName := strings.Join([]string{path, name}, string(filepath.Separator)) + buildPathName := strings.Join([]string{".", name}, string(filepath.Separator)) serve := exec.Command(buildPathName, fmt.Sprintf("--port=%d", port), fmt.Sprintf("--httpsport=%d", httpsport), diff --git a/cmd/ponzu/paths.go b/cmd/ponzu/paths.go index 73d8d73..8bc6e39 100644 --- a/cmd/ponzu/paths.go +++ b/cmd/ponzu/paths.go @@ -11,14 +11,3 @@ func buildOutputName() string { return "ponzu-server" } - -// buildOutputPath returns the correct path to the ponzu-server binary -// built, based on the host Operating System. This is necessary so that -// the UNIX-y systems know to look in the current directory, and not the $PATH -func buildOutputPath() string { - if runtime.GOOS == "windows" { - return "" - } - - return "." -} |