Skip to content

Commit fb8a7fb

Browse files
committed
Fix go get error
1 parent 920fa90 commit fb8a7fb

File tree

1 file changed

+21
-21
lines changed

1 file changed

+21
-21
lines changed

commands/new_go.go

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -34,13 +34,21 @@ func newGoClient(projectName, serverURL, cgVersion string) error {
3434
return err
3535
}
3636

37+
out, err := external.ExecuteInDirHidden(projectName, "go", "mod", "init", module)
38+
if err != nil {
39+
if out != "" {
40+
cli.Error(out)
41+
}
42+
return err
43+
}
44+
3745
cli.Begin("Installing correct go-client version...")
3846
libraryURL, libraryTag, err := getGoClientLibraryURL(projectName, cgVersion)
3947
if err != nil {
4048
return err
4149
}
4250

43-
out, err := external.ExecuteInDirHidden(projectName, "go", "get", fmt.Sprintf("%s@%s", libraryURL, libraryTag))
51+
out, err = external.ExecuteInDirHidden(projectName, "go", "get", fmt.Sprintf("%s@%s", libraryURL, libraryTag))
4452
if err != nil {
4553
if out != "" {
4654
cli.Error(out)
@@ -50,7 +58,7 @@ func newGoClient(projectName, serverURL, cgVersion string) error {
5058
cli.Finish()
5159

5260
cli.Begin("Creating project template...")
53-
err = createGoClientTemplate(projectName, module, serverURL, libraryURL)
61+
err = createGoClientTemplate(projectName, serverURL, libraryURL)
5462
if err != nil {
5563
return err
5664
}
@@ -81,15 +89,7 @@ func newGoClient(projectName, serverURL, cgVersion string) error {
8189
return nil
8290
}
8391

84-
func createGoClientTemplate(projectName, module, serverURL, libraryURL string) error {
85-
out, err := external.ExecuteInDirHidden(projectName, "go", "mod", "init", module)
86-
if err != nil {
87-
if out != "" {
88-
cli.Error(out)
89-
}
90-
return err
91-
}
92-
92+
func createGoClientTemplate(projectName, serverURL, libraryURL string) error {
9393
tmpl, err := template.New("main.go").Parse(goClientMainTemplate)
9494
if err != nil {
9595
return err
@@ -143,6 +143,14 @@ func newGoServer(projectName string) error {
143143
return err
144144
}
145145

146+
out, err := external.ExecuteInDirHidden(projectName, "go", "mod", "init", module)
147+
if err != nil {
148+
if out != "" {
149+
cli.Error(out)
150+
}
151+
return err
152+
}
153+
146154
cli.Begin("Fetching latest version numbers...")
147155
cgeVersion, err := external.LatestCGEVersion()
148156
if err != nil {
@@ -164,7 +172,7 @@ func newGoServer(projectName string) error {
164172

165173
cli.Begin("Installing dependencies...")
166174

167-
out, err := external.ExecuteInDirHidden(projectName, "go", "mod", "tidy")
175+
out, err = external.ExecuteInDirHidden(projectName, "go", "mod", "tidy")
168176
if err != nil {
169177
if out != "" {
170178
cli.Error(out)
@@ -190,15 +198,7 @@ func newGoServer(projectName string) error {
190198
}
191199

192200
func createGoServerTemplate(projectName, module, cgeVersion, libraryURL string) error {
193-
out, err := external.ExecuteInDirHidden(projectName, "go", "mod", "init", module)
194-
if err != nil {
195-
if out != "" {
196-
cli.Error(out)
197-
}
198-
return err
199-
}
200-
201-
err = executeGoServerTemplate(goServerMainTemplate, "main.go", projectName, cgeVersion, libraryURL, module)
201+
err := executeGoServerTemplate(goServerMainTemplate, "main.go", projectName, cgeVersion, libraryURL, module)
202202
if err != nil {
203203
return err
204204
}

0 commit comments

Comments
 (0)