Revert "Use v2 of urfave/cli"

This reverts commit 17df897c32.

That did not work *at all*... We really need some tests for all of
this.

go.mod

@@ -4,13 +4,13 @@ go 1.13
 
 require (
 	github.com/NYTimes/gziphandler v1.1.1
-	github.com/creack/pty v1.1.7
+	github.com/creack/pty v1.1.11
-	github.com/elazarl/go-bindata-assetfs v1.0.0
+	github.com/elazarl/go-bindata-assetfs v1.0.1
 	github.com/fatih/structs v1.1.0
-	github.com/gorilla/websocket v1.4.1
+	github.com/gorilla/websocket v1.4.2
-	github.com/hashicorp/go-multierror v1.0.0 // indirect
+	github.com/hashicorp/go-multierror v1.1.1 // indirect
 	github.com/pkg/errors v0.9.1
-	github.com/urfave/cli/v2 v2.3.0
+	github.com/urfave/cli v1.22.5
 	github.com/yudai/hcl v0.0.0-20151013225006-5fa2393b3552
-	golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae // indirect
+	golang.org/x/sys v0.0.0-20210412220455-f1c623a9e750 // indirect
 )

go.sum

@@ -36,14 +36,15 @@ github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeV
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/testify v1.3.0 h1:TivCn/peBQ7UY8ooIcPgZFpTNSz0Q2U6UrFlUfqbe0Q=
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
-github.com/urfave/cli/v2 v2.3.0 h1:qph92Y649prgesehzOrQjdWyxFOp/QVM+6imKHad91M=
+github.com/urfave/cli v1.22.2 h1:gsqYFH8bb9ekPA12kRo0hfjngWQjkJPlN9R0N78BoUo=
-github.com/urfave/cli/v2 v2.3.0/go.mod h1:LJmUH05zAU44vOAcrfzZQKsZbVcdbOG8rtL3/XcUArI=
+github.com/urfave/cli v1.22.2/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0=
+github.com/urfave/cli v1.22.5 h1:lNq9sAHXK2qfdI8W+GRItjCEkI+2oR4d+MEHy1CKXoU=
+github.com/urfave/cli v1.22.5/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0=
 github.com/yudai/hcl v0.0.0-20151013225006-5fa2393b3552 h1:tjsK9T2IA3d2FFNxzDP7AJf+EXhyuPd7PB4Z2HrtAoc=
 github.com/yudai/hcl v0.0.0-20151013225006-5fa2393b3552/go.mod h1:hg0ZaCmQL3rze1cH8Fh2g0a9q8vQs0uN8ESpePEwSEw=
 golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae h1:/WDfKMnPU+m5M4xB+6x4kaepxRw6jWvR5iDRdvjHgy8=
 golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210412220455-f1c623a9e750 h1:ZBu6861dZq7xBnG1bn5SRU0vA8nx42at4+kP07FMTog=
 golang.org/x/sys v0.0.0-20210412220455-f1c623a9e750/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/yaml.v2 v2.2.3/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=

main.go

@@ -9,7 +9,7 @@ import (
 	"strings"
 	"syscall"
 
-	cli "github.com/urfave/cli/v2"
+	"github.com/urfave/cli"
 
 	"github.com/sorenisanerd/gotty/backend/localcommand"
 	"github.com/sorenisanerd/gotty/pkg/homedir"
@@ -41,16 +41,16 @@ func main() {
 
 	app.Flags = append(
 		cliFlags,
-		&cli.StringFlag{
+		cli.StringFlag{
-			Name:    "config",
+			Name:   "config",
-			Value:   "~/.gotty",
+			Value:  "~/.gotty",
-			Usage:   "Config file path",
+			Usage:  "Config file path",
-			EnvVars: []string{"GOTTY_CONFIG"},
+			EnvVar: "GOTTY_CONFIG",
 		},
 	)
 
-	app.Action = func(c *cli.Context) error {
+	app.Action = func(c *cli.Context) {
-		if c.NArg() == 0 {
+		if len(c.Args()) == 0 {
 			msg := "Error: No command given."
 			cli.ShowAppHelp(c)
 			exit(fmt.Errorf(msg), 1)
@@ -75,15 +75,15 @@ func main() {
 		}
 
 		args := c.Args()
-		factory, err := localcommand.NewFactory(args.First(), args.Tail(), backendOptions)
+		factory, err := localcommand.NewFactory(args[0], args[1:], backendOptions)
 		if err != nil {
 			exit(err, 3)
 		}
 
 		hostname, _ := os.Hostname()
 		appOptions.TitleVariables = map[string]interface{}{
-			"command":  args.First(),
+			"command":  args[0],
-			"argv":     args.Tail(),
+			"argv":     args[1:],
 			"hostname": hostname,
 		}
 
@@ -95,7 +95,7 @@ func main() {
 		ctx, cancel := context.WithCancel(context.Background())
 		gCtx, gCancel := context.WithCancel(context.Background())
 
-		log.Printf("GoTTY is starting with command: %s", strings.Join(args.Slice(), " "))
+		log.Printf("GoTTY is starting with command: %s", strings.Join(args, " "))
 
 		errs := make(chan error, 1)
 		go func() {
@@ -108,7 +108,6 @@ func main() {
 			exit(err, 8)
 		}
 
-		return nil
 	}
 	app.Run(os.Args)
 }

utils/flags.go

@@ -8,7 +8,7 @@ import (
 	"strings"
 
 	"github.com/fatih/structs"
-	"github.com/urfave/cli/v2"
+	"github.com/urfave/cli"
 	"github.com/yudai/hcl"
 
 	"github.com/sorenisanerd/gotty/pkg/homedir"
@@ -36,24 +36,24 @@ func GenerateFlags(options ...interface{}) (flags []cli.Flag, mappings map[strin
 
 			switch field.Kind() {
 			case reflect.String:
-				flags = append(flags, &cli.StringFlag{
+				flags = append(flags, cli.StringFlag{
-					Name:    flagName,
+					Name:   flagName,
-					Value:   field.Value().(string),
+					Value:  field.Value().(string),
-					Usage:   flagDescription,
+					Usage:  flagDescription,
-					EnvVars: []string{envName},
+					EnvVar: envName,
 				})
 			case reflect.Bool:
-				flags = append(flags, &cli.BoolFlag{
+				flags = append(flags, cli.BoolFlag{
-					Name:    flagName,
+					Name:   flagName,
-					Usage:   flagDescription,
+					Usage:  flagDescription,
-					EnvVars: []string{envName},
+					EnvVar: envName,
 				})
 			case reflect.Int:
-				flags = append(flags, &cli.IntFlag{
+				flags = append(flags, cli.IntFlag{
-					Name:    flagName,
+					Name:   flagName,
-					Value:   field.Value().(int),
+					Value:  field.Value().(int),
-					Usage:   flagDescription,
+					Usage:  flagDescription,
-					EnvVars: []string{envName},
+					EnvVar: envName,
 				})
 			}
 		}