From a2b066decbdb8648e9b997a2e54cd63b7ce3d727 Mon Sep 17 00:00:00 2001 From: Travis McLane Date: Sat, 18 Apr 2020 13:56:46 -0500 Subject: [PATCH] wip: attempting to remove '.exe' from binary name --- cmd/helpers.go | 14 +------------- cmd/project.go | 8 +------- 2 files changed, 2 insertions(+), 20 deletions(-) diff --git a/cmd/helpers.go b/cmd/helpers.go index a4b620720..3645d1b10 100644 --- a/cmd/helpers.go +++ b/cmd/helpers.go @@ -9,7 +9,6 @@ import ( "path/filepath" "runtime" "strconv" - "strings" "time" "github.com/leaanthony/mewn" @@ -137,7 +136,7 @@ func BuildDocker(binaryName string, buildMode string, projectOptions *ProjectOpt "docker", "run", "--rm", - "-v", fmt.Sprintf("%s/build:/build", fs.Cwd()), + "-v", fmt.Sprintf("%s:/build", filepath.Join(fs.Cwd(), "build")), "-v", fmt.Sprintf("%s:/source", fs.Cwd()), "-e", fmt.Sprintf("LOCAL_USER_ID=%v", userid), "-e", fmt.Sprintf("FLAG_LDFLAGS=%s", ldFlags(projectOptions, buildMode)), @@ -222,17 +221,6 @@ func BuildNative(binaryName string, forceRebuild bool, buildMode string, project } if binaryName != "" { - // Alter binary name based on OS - switch projectOptions.Platform { - case "windows": - if !strings.HasSuffix(binaryName, ".exe") { - binaryName += ".exe" - } - default: - if strings.HasSuffix(binaryName, ".exe") { - binaryName = strings.TrimSuffix(binaryName, ".exe") - } - } buildCommand.Add("-o", filepath.Join("build", binaryName)) } diff --git a/cmd/project.go b/cmd/project.go index 9b7ba86d1..8df8f289a 100644 --- a/cmd/project.go +++ b/cmd/project.go @@ -6,7 +6,6 @@ import ( "io/ioutil" "os" "path/filepath" - "runtime" "sort" "strings" @@ -188,7 +187,7 @@ func (po *ProjectOptions) GetNPMBinaryName() (PackageManager, error) { if strings.Index(po.FrontEnd.Install, "yarn") > -1 { return YARN, nil } - + helper return UNKNOWN, nil } @@ -336,11 +335,6 @@ func processBinaryName(po *ProjectOptions) { if po.BinaryName == "" { var binaryNameComputed = computeBinaryName(po.Name) po.BinaryName = Prompt("The output binary name", binaryNameComputed) - if runtime.GOOS == "windows" { - if !strings.HasSuffix(po.BinaryName, ".exe") { - po.BinaryName += ".exe" - } - } } fmt.Println("Output binary Name: " + po.BinaryName) }