forge this!
This commit is contained in:
parent
31eac3d915
commit
8e315cc238
|
@ -69,15 +69,20 @@ func (c *controlBox) buildPackage() (bool, error) {
|
||||||
return false, errors.New("binary existed before build")
|
return false, errors.New("binary existed before build")
|
||||||
}
|
}
|
||||||
|
|
||||||
|
forgecmd := "forge"
|
||||||
|
if argv.Forge == "go.wit.com/apps/forge" {
|
||||||
|
forgecmd = "last.forge"
|
||||||
|
}
|
||||||
|
|
||||||
if argv.Release {
|
if argv.Release {
|
||||||
os.Unsetenv("GO111MODULE")
|
os.Unsetenv("GO111MODULE")
|
||||||
cmd := []string{"forge", "--verbose", "--install", argv.Forge}
|
cmd := []string{forgecmd, "--verbose", "--install", argv.Forge}
|
||||||
if err := shell.PathExecVerbose("", cmd); err != nil {
|
if err := shell.PathExecVerbose("", cmd); err != nil {
|
||||||
badExit(err)
|
badExit(err)
|
||||||
return false, fmt.Errorf("go build err %v", 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
|
// must 'go install' then 'go build' so they are both in ~/go/src and in the repo dir
|
||||||
cmd = []string{"forge", "--verbose", "--build", argv.Forge}
|
cmd = []string{forgecmd, "--verbose", "--build", argv.Forge}
|
||||||
if err := shell.PathExecVerbose("", cmd); err != nil {
|
if err := shell.PathExecVerbose("", cmd); err != nil {
|
||||||
badExit(err)
|
badExit(err)
|
||||||
return false, fmt.Errorf("go build err %v", err)
|
return false, fmt.Errorf("go build err %v", err)
|
||||||
|
|
Loading…
Reference in New Issue