@@ -81,7 +81,7 @@ func newServer(projectName string) error {
8181 language = strings .ToLower (pflag .Arg (2 ))
8282 } else {
8383 var err error
84- language , err = cli .Select ("In which language do you want to write your project? " , []string {"Go" }, []string {"go" })
84+ language , err = cli .Select ("Language: " , []string {"Go" }, []string {"go" })
8585 if err != nil {
8686 return err
8787 }
@@ -98,7 +98,7 @@ func newServer(projectName string) error {
9898}
9999
100100func newClient (projectName string ) error {
101- url , err := cli .Input ("Enter the URL of the game server :" )
101+ url , err := cli .Input ("Game server URL:" )
102102 if err != nil {
103103 return err
104104 }
@@ -127,7 +127,7 @@ func newClient(projectName string) error {
127127 language = strings .ToLower (pflag .Arg (2 ))
128128 } else {
129129 var err error
130- language , err = cli .Select ("In which language do you want to write your project? " , []string {"Go" }, []string {"go" })
130+ language , err = cli .Select ("Language " , []string {"Go" }, []string {"go" })
131131 if err != nil {
132132 return err
133133 }
@@ -157,7 +157,7 @@ func git(projectName string) error {
157157 return nil
158158 }
159159
160- yes , err := cli .YesNo ("Do you want to initialize git?" , true )
160+ yes , err := cli .YesNo ("Initialize git?" , true )
161161 if err != nil {
162162 os .RemoveAll (projectName )
163163 return err
@@ -177,7 +177,7 @@ func git(projectName string) error {
177177}
178178
179179func readme (projectName string ) error {
180- yes , err := cli .YesNo ("Create a README file ?" , true )
180+ yes , err := cli .YesNo ("Create README?" , true )
181181 if err != nil {
182182 os .RemoveAll (projectName )
183183 return err
@@ -220,7 +220,7 @@ var licenseApache string
220220var licenseReadmeApache string
221221
222222func license (projectName string ) error {
223- license , err := cli .Select ("Select a license " , []string {"None" , "MIT" , "GPLv3" , "AGPL" , "Apache 2.0" }, []string {"none" , "MIT" , "GPL" , "AGPL" , "Apache" })
223+ license , err := cli .Select ("License " , []string {"None" , "MIT" , "GPLv3" , "AGPL" , "Apache 2.0" }, []string {"none" , "MIT" , "GPL" , "AGPL" , "Apache" })
224224 if err != nil {
225225 os .RemoveAll (projectName )
226226 return err
@@ -315,9 +315,13 @@ func getCodeGameInfo(baseURL string) (string, string, error) {
315315 Name string `json:"name"`
316316 CGVersion string `json:"cg_version"`
317317 }
318- res , err := http .Get (baseURL + "/info" )
319- if err != nil || res .StatusCode != http .StatusOK || ! external .HasContentType (res .Header , "application/json" ) {
320- return "" , "" , cli .Error ("Couldn't access /info endpoint." )
318+ url := baseURL + "/info"
319+ res , err := http .Get (url )
320+ if err != nil || res .StatusCode != http .StatusOK {
321+ return "" , "" , cli .Error ("Couldn't access %s." , url )
322+ }
323+ if ! external .HasContentType (res .Header , "application/json" ) {
324+ return "" , "" , cli .Error ("%s doesn't return JSON." , url )
321325 }
322326 defer res .Body .Close ()
323327
0 commit comments