@@ -34,13 +34,21 @@ func newGoClient(projectName, serverURL, cgVersion string) error {
34
34
return err
35
35
}
36
36
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
+
37
45
cli .Begin ("Installing correct go-client version..." )
38
46
libraryURL , libraryTag , err := getGoClientLibraryURL (projectName , cgVersion )
39
47
if err != nil {
40
48
return err
41
49
}
42
50
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 ))
44
52
if err != nil {
45
53
if out != "" {
46
54
cli .Error (out )
@@ -50,7 +58,7 @@ func newGoClient(projectName, serverURL, cgVersion string) error {
50
58
cli .Finish ()
51
59
52
60
cli .Begin ("Creating project template..." )
53
- err = createGoClientTemplate (projectName , module , serverURL , libraryURL )
61
+ err = createGoClientTemplate (projectName , serverURL , libraryURL )
54
62
if err != nil {
55
63
return err
56
64
}
@@ -81,15 +89,7 @@ func newGoClient(projectName, serverURL, cgVersion string) error {
81
89
return nil
82
90
}
83
91
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 {
93
93
tmpl , err := template .New ("main.go" ).Parse (goClientMainTemplate )
94
94
if err != nil {
95
95
return err
@@ -143,6 +143,14 @@ func newGoServer(projectName string) error {
143
143
return err
144
144
}
145
145
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
+
146
154
cli .Begin ("Fetching latest version numbers..." )
147
155
cgeVersion , err := external .LatestCGEVersion ()
148
156
if err != nil {
@@ -164,7 +172,7 @@ func newGoServer(projectName string) error {
164
172
165
173
cli .Begin ("Installing dependencies..." )
166
174
167
- out , err : = external .ExecuteInDirHidden (projectName , "go" , "mod" , "tidy" )
175
+ out , err = external .ExecuteInDirHidden (projectName , "go" , "mod" , "tidy" )
168
176
if err != nil {
169
177
if out != "" {
170
178
cli .Error (out )
@@ -190,15 +198,7 @@ func newGoServer(projectName string) error {
190
198
}
191
199
192
200
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 )
202
202
if err != nil {
203
203
return err
204
204
}
0 commit comments