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.")
 	}
 }