diff options
| -rw-r--r-- | argv.go | 1 | ||||
| -rw-r--r-- | buildPackage.go | 20 |
2 files changed, 19 insertions, 2 deletions
@@ -20,6 +20,7 @@ type args struct { Release bool `arg:"--release" help:"build a release from the last git tag"` KeepFiles bool `arg:"--keep-files" help:"keep the build files/"` Force bool `arg:"--force" default:"false" help:"force overwrite an existing .deb file"` + Verbose bool `arg:"--verbose" help:"show more things"` } func init() { diff --git a/buildPackage.go b/buildPackage.go index 14d7d7b..a8d2c55 100644 --- a/buildPackage.go +++ b/buildPackage.go @@ -69,20 +69,36 @@ func (c *controlBox) buildPackage() (bool, error) { return false, errors.New("binary existed before build") } + /* forgecmd := "forge" if argv.Forge == "go.wit.com/apps/forge" { forgecmd = "last.forge" } + */ if argv.Release { os.Unsetenv("GO111MODULE") - cmd := []string{forgecmd, "--verbose", "--install", argv.Forge} + // cmd := []string{forgecmd, "--verbose", "--install", argv.Forge} + cmd := []string{"go"} + cmd = append(cmd, "install") + if argv.Verbose { + cmd = append(cmd, "-v") + cmd = append(cmd, "-x") + } + cmd = append(cmd, argv.Forge + "@v" + version) if err := shell.PathExecVerbose("", cmd); err != nil { badExit(err) return false, fmt.Errorf("go build err %v", err) } // must 'go install' then 'go build' so they are both in ~/go/src and in the repo dir - cmd = []string{forgecmd, "--verbose", "--build", argv.Forge} + // cmd = []string{forgecmd, "--verbose", "--build", argv.Forge} + cmd = []string{"go"} + cmd = append(cmd, "build") + if argv.Verbose { + cmd = append(cmd, "-v") + cmd = append(cmd, "-x") + } + cmd = append(cmd, argv.Forge) if err := shell.PathExecVerbose("", cmd); err != nil { badExit(err) return false, fmt.Errorf("go build err %v", err) |