fixup! refactor: rename package 'subcmd' to 'gateway'

tyru · tyru · commit c7f1bb901c4b · 2018-10-28T22:01:02.000+09:00
diff --git a/main.go b/main.go
@@ -73,16 +73,16 @@ func run(args []string) (int, string) {
 	return result.Code, result.Msg
 }
 
-func expandAlias(gateway string, args []string) (string, []string, error) {
+func expandAlias(subCmd string, args []string) (string, []string, error) {
 	cfg, err := config.Read()
 	if err != nil {
 		return "", nil, errors.Wrap(err, "could not read config.toml")
 	}
-	if newArgs, exists := cfg.Alias[gateway]; exists && len(newArgs) > 0 {
-		gateway = newArgs[0]
+	if newArgs, exists := cfg.Alias[subCmd]; exists && len(newArgs) > 0 {
+		subCmd = newArgs[0]
 		args = append(newArgs[1:], args...)
 	}
-	return gateway, args, nil
+	return subCmd, args, nil
 }
 
 // On Windows, this function always returns nil.

Original file line number	Diff line number	Diff line change
`@@ -73,16 +73,16 @@ func run(args []string) (int, string) {`
`73`	`73`	`return result.Code, result.Msg`
`74`	`74`	`}`
`75`	`75`
`76`		`-func expandAlias(gateway string, args []string) (string, []string, error) {`
	`76`	`+func expandAlias(subCmd string, args []string) (string, []string, error) {`
`77`	`77`	`cfg, err := config.Read()`
`78`	`78`	`if err != nil {`
`79`	`79`	`return "", nil, errors.Wrap(err, "could not read config.toml")`
`80`	`80`	`}`
`81`		`- if newArgs, exists := cfg.Alias[gateway]; exists && len(newArgs) > 0 {`
`82`		`- gateway = newArgs[0]`
	`81`	`+ if newArgs, exists := cfg.Alias[subCmd]; exists && len(newArgs) > 0 {`
	`82`	`+ subCmd = newArgs[0]`
`83`	`83`	`args = append(newArgs[1:], args...)`
`84`	`84`	`}`
`85`		`- return gateway, args, nil`
	`85`	`+ return subCmd, args, nil`
`86`	`86`	`}`
`87`	`87`
`88`	`88`	`// On Windows, this function always returns nil.`