summaryrefslogtreecommitdiffstats
path: root/cmd
diff options
context:
space:
mode:
authorChristopher Speller <crspeller@gmail.com>2018-05-29 13:21:42 -0700
committerGitHub <noreply@github.com>2018-05-29 13:21:42 -0700
commit2f6039f23f75ef0d63f980c8354d3d638071f230 (patch)
treee258e996c7fff2e269ddd65cb8c76539482bca04 /cmd
parentd3cf110620033f8831a55a3fd911d7864b6aab4a (diff)
downloadchat-2f6039f23f75ef0d63f980c8354d3d638071f230.tar.gz
chat-2f6039f23f75ef0d63f980c8354d3d638071f230.tar.bz2
chat-2f6039f23f75ef0d63f980c8354d3d638071f230.zip
Revert "MM-6839: search relative to executable (#8853)" (#8876)
This reverts commit d3cf110620033f8831a55a3fd911d7864b6aab4a.
Diffstat (limited to 'cmd')
-rw-r--r--cmd/platform/main.go22
1 files changed, 12 insertions, 10 deletions
diff --git a/cmd/platform/main.go b/cmd/platform/main.go
index 6d9952c70..b5ea51920 100644
--- a/cmd/platform/main.go
+++ b/cmd/platform/main.go
@@ -6,11 +6,20 @@ package main
import (
"fmt"
"os"
+ "path/filepath"
"syscall"
-
- "github.com/mattermost/mattermost-server/utils"
)
+func findMattermostBinary() string {
+ for _, file := range []string{"./mattermost", "../mattermost", "./bin/mattermost"} {
+ path, _ := filepath.Abs(file)
+ if stat, err := os.Stat(path); err == nil && !stat.IsDir() {
+ return path
+ }
+ }
+ return "./mattermost"
+}
+
func main() {
// Print angry message to use mattermost command directly
fmt.Println(`
@@ -24,14 +33,7 @@ The platform binary will be removed in a future version.
args := os.Args
args[0] = "mattermost"
args = append(args, "--platform")
-
- realMattermost := utils.FindFile("mattermost")
- if realMattermost == "" {
- // This will still fail, of course.
- realMattermost = "./mattermost"
- }
-
- if err := syscall.Exec(utils.FindFile("mattermost"), args, nil); err != nil {
+ if err := syscall.Exec(findMattermostBinary(), args, nil); err != nil {
fmt.Println("Could not start Mattermost, use the mattermost command directly.")
}
}