Merge pull request #93 from arifemre/patch-2

Update build.go

buffalo/cmd/build.go

@@ -23,17 +23,17 @@ package cmd
 import (
 	"bytes"
 	"fmt"
+	"github.com/gobuffalo/velvet"
+	"github.com/spf13/cobra"
 	"io"
 	"io/ioutil"
 	"os"
 	"os/exec"
 	"path/filepath"
 	"regexp"
+	"runtime"
 	"strings"
 	"time"
-
-	"github.com/gobuffalo/velvet"
-	"github.com/spf13/cobra"
 )
 
 var outputBinName string
@@ -146,8 +146,8 @@ func (b *builder) buildRiceZip() error {
 				}
 				rx := regexp.MustCompile("(rice.FindBox|rice.MustFindBox)")
 				if rx.Match(s) {
-					gopath := filepath.Join(os.Getenv("GOPATH"), "src")
-					pkg := filepath.Dir(strings.Replace(path, gopath+"/", "", -1))
+					gopath := strings.Replace(filepath.Join(os.Getenv("GOPATH"), "src"), "\\", "/", -1)
+					pkg := strings.Replace(filepath.Dir(strings.Replace(path, gopath+"/", "", -1)), "\\", "/", -1)
 					paths[pkg] = true
 				}
 			}
@@ -219,8 +219,8 @@ func (b *builder) buildMain() error {
 	}
 	ctx := velvet.NewContext()
 	ctx.Set("root", root)
-	ctx.Set("modelsPack", filepath.Join(packagePath(root), "models"))
-	ctx.Set("aPack", filepath.Join(packagePath(root), "a"))
+	ctx.Set("modelsPack", packagePath(root)+"/models")
+	ctx.Set("aPack", packagePath(root)+"/a")
 	ctx.Set("name", filepath.Base(root))
 	s, err := velvet.Render(buildMainTmpl, ctx)
 	if err != nil {
@@ -328,7 +328,13 @@ var buildCmd = &cobra.Command{
 func init() {
 	RootCmd.AddCommand(buildCmd)
 	pwd, _ := os.Getwd()
-	buildCmd.Flags().StringVarP(&outputBinName, "output", "o", filepath.Join("bin", filepath.Base(pwd)), "set the name of the binary")
+	output := filepath.Join("bin", filepath.Base(pwd))
+
+	if runtime.GOOS == "windows" {
+		output += ".exe"
+	}
+
+	buildCmd.Flags().StringVarP(&outputBinName, "output", "o", output, "set the name of the binary")
 	buildCmd.Flags().BoolVarP(&zipBin, "zip", "z", false, "zips the assets to the binary, this requires zip installed")
 }