fix: setup command can run any times without error (#321)

* fix: setup command can run any times without error

* fix the lint errors

Author: LinuxSuRen

.github/pre-commit

@@ -0,0 +1,2 @@
+#!/bin/sh
+make pre-commit

.github/workflows/coverage-report.yaml

@@ -12,7 +12,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v3
         with:
-          go-version: 1.16.x
+          go-version: 1.18.x
       - uses: actions/[email protected]
       - name: Test
         run: |

.github/workflows/pull-request.yaml

@@ -13,7 +13,7 @@ jobs:
       - name: Set up Go 1.16
         uses: actions/setup-go@v3
         with:
-          go-version: 1.16
+          go-version: 1.18
         id: go
       - name: Check out code into the Go module directory
         uses: actions/[email protected]
@@ -55,7 +55,7 @@ jobs:
       - name: Set up Go 1.16
         uses: actions/setup-go@v3
         with:
-          go-version: 1.16
+          go-version: 1.18
         id: go
       - name: Check out code into the Go module directory
         uses: actions/[email protected]

.github/workflows/release.yaml

@@ -16,7 +16,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v3
         with:
-          go-version: 1.16.x
+          go-version: 1.18.x
       - name: Upgrade upx
         run: |
           # try to fix https://github.com/jenkins-zh/jenkins-cli/issues/493

Makefile

@@ -9,7 +9,9 @@ build-linux: fmt lint
 
 test: fmt lint
 	go test ./... -coverprofile coverage.out
-
+pre-commit: fmt lint test build
+cp-pre-commit:
+	cp .github/pre-commit .git/hooks/pre-commit
 run:
 	go run main.go
 

cmd/get_test.go

@@ -5,7 +5,7 @@ import (
 	"context"
 	"errors"
 	"fmt"
-	"io/ioutil"
+	"io"
 	"net/http"
 	"os"
 	"path"
@@ -142,7 +142,7 @@ func TestRunE(t *testing.T) {
 				Header: map[string][]string{
 					"Content-Length": {"100"},
 				},
-				Body: ioutil.NopCloser(bytes.NewBufferString("responseBody")),
+				Body: io.NopCloser(bytes.NewBufferString("responseBody")),
 			}
 			roundTripper.EXPECT().
 				RoundTrip(mockRequest).Return(mockResponse, nil)
@@ -173,7 +173,7 @@ func TestRunE(t *testing.T) {
 				Header: map[string][]string{
 					"Content-Length": {"100"},
 				},
-				Body: ioutil.NopCloser(bytes.NewBufferString("responseBody")),
+				Body: io.NopCloser(bytes.NewBufferString("responseBody")),
 			}
 			roundTripper.EXPECT().
 				RoundTrip(mockRequest).Return(mockResponse, nil)
@@ -188,7 +188,7 @@ func TestRunE(t *testing.T) {
 				Header: map[string][]string{
 					"Content-Length": {"100"},
 				},
-				Body: ioutil.NopCloser(bytes.NewBufferString("responseBody")),
+				Body: io.NopCloser(bytes.NewBufferString("responseBody")),
 			}
 			roundTripper.EXPECT().
 				RoundTrip(mockRequest1).Return(mockResponse1, nil)
@@ -203,7 +203,7 @@ func TestRunE(t *testing.T) {
 				Header: map[string][]string{
 					"Content-Length": {"100"},
 				},
-				Body: ioutil.NopCloser(bytes.NewBufferString("responseBody")),
+				Body: io.NopCloser(bytes.NewBufferString("responseBody")),
 			}
 			roundTripper.EXPECT().
 				RoundTrip(mockRequest2).Return(mockResponse2, nil)

cmd/setup.go

@@ -2,11 +2,12 @@ package cmd
 
 import (
 	"fmt"
+	"os"
+	"path"
+
 	"github.com/AlecAivazis/survey/v2"
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
-	"os"
-	"path"
 )
 
 func newSetupCommand() (cmd *cobra.Command) {
@@ -26,6 +27,7 @@ func (o *setupOption) runE(cmd *cobra.Command, args []string) (err error) {
 	selector := &survey.Select{
 		Message: "Select proxy-github",
 		Options: []string{"gh.api.99988866.xyz", "ghproxy.com", "mirror.ghproxy.com", ""},
+		Default: viper.Get("proxy-github"),
 	}
 
 	var choose string
@@ -41,6 +43,6 @@ func (o *setupOption) runE(cmd *cobra.Command, args []string) (err error) {
 		return
 	}
 
-	err = viper.SafeWriteConfigAs(path.Join(configDir, "hd.yaml"))
+	err = viper.WriteConfigAs(path.Join(configDir, "hd.yaml"))
 	return
 }

cmd/util.go

@@ -2,12 +2,9 @@ package cmd
 
 import (
 	"context"
-	"github.com/spf13/cobra"
-	"io"
 	"net/http"
-	"os"
-	"os/exec"
-	"sync"
+
+	"github.com/spf13/cobra"
 )
 
 func getOrDefault(key, def string, data map[string]string) (result string) {
@@ -33,62 +30,6 @@ func getRoundTripper(ctx context.Context) (tripper http.RoundTripper) {
 	return
 }
 
-func execCommandInDir(name, dir string, arg ...string) (err error) {
-	command := exec.Command(name, arg...)
-	if dir != "" {
-		command.Dir = dir
-	}
-
-	//var stdout []byte
-	//var errStdout error
-	stdoutIn, _ := command.StdoutPipe()
-	stderrIn, _ := command.StderrPipe()
-	err = command.Start()
-	if err != nil {
-		return err
-	}
-
-	// cmd.Wait() should be called only after we finish reading
-	// from stdoutIn and stderrIn.
-	// wg ensures that we finish
-	var wg sync.WaitGroup
-	wg.Add(1)
-	go func() {
-		_, _ = copyAndCapture(os.Stdout, stdoutIn)
-		wg.Done()
-	}()
-
-	_, _ = copyAndCapture(os.Stderr, stderrIn)
-
-	wg.Wait()
-
-	err = command.Wait()
-	return
-}
-
-func copyAndCapture(w io.Writer, r io.Reader) ([]byte, error) {
-	var out []byte
-	buf := make([]byte, 1024, 1024)
-	for {
-		n, err := r.Read(buf[:])
-		if n > 0 {
-			d := buf[:n]
-			out = append(out, d...)
-			_, err := w.Write(d)
-			if err != nil {
-				return out, err
-			}
-		}
-		if err != nil {
-			// Read returns io.EOF at the end of file, which is not an error for us
-			if err == io.EOF {
-				err = nil
-			}
-			return out, err
-		}
-	}
-}
-
 // CompletionFunc is the function for command completion
 type CompletionFunc func(cmd *cobra.Command, args []string, toComplete string) ([]string, cobra.ShellCompDirective)
 

go.mod

@@ -1,6 +1,6 @@
 module github.com/linuxsuren/http-downloader
 
-go 1.16
+go 1.18
 
 require (
 	github.com/AlecAivazis/survey/v2 v2.3.2
@@ -11,14 +11,59 @@ require (
 	github.com/h2non/gock v1.0.9
 	github.com/linuxsuren/cobra-extension v0.0.16
 	github.com/mitchellh/go-homedir v1.1.0
-	github.com/nbio/st v0.0.0-20140626010706-e9e8d9816f32 // indirect
 	github.com/onsi/ginkgo v1.16.5
 	github.com/onsi/gomega v1.18.1
 	github.com/spf13/cobra v1.2.1
 	github.com/spf13/pflag v1.0.5
 	github.com/spf13/viper v1.9.0
 	github.com/stretchr/testify v1.7.0
 	github.com/xi2/xz v0.0.0-20171230120015-48954b6210f8
-	golang.org/x/crypto v0.0.0-20220315160706-3147a52a75dd // indirect
 	gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b
 )
+
+require (
+	github.com/Microsoft/go-winio v0.4.16 // indirect
+	github.com/ProtonMail/go-crypto v0.0.0-20210428141323-04723f9f07d7 // indirect
+	github.com/acomagu/bufpipe v1.0.3 // indirect
+	github.com/davecgh/go-spew v1.1.1 // indirect
+	github.com/emirpasic/gods v1.12.0 // indirect
+	github.com/fsnotify/fsnotify v1.5.1 // indirect
+	github.com/go-git/gcfg v1.5.0 // indirect
+	github.com/go-git/go-billy/v5 v5.3.1 // indirect
+	github.com/golang/protobuf v1.5.2 // indirect
+	github.com/google/go-querystring v1.0.0 // indirect
+	github.com/gosuri/uilive v0.0.3 // indirect
+	github.com/hashicorp/hcl v1.0.0 // indirect
+	github.com/imdario/mergo v0.3.12 // indirect
+	github.com/inconshreveable/mousetrap v1.0.0 // indirect
+	github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect
+	github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 // indirect
+	github.com/kevinburke/ssh_config v0.0.0-20201106050909-4977a11b4351 // indirect
+	github.com/magiconair/properties v1.8.5 // indirect
+	github.com/mattn/go-colorable v0.1.6 // indirect
+	github.com/mattn/go-isatty v0.0.12 // indirect
+	github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b // indirect
+	github.com/mitchellh/mapstructure v1.4.2 // indirect
+	github.com/nbio/st v0.0.0-20140626010706-e9e8d9816f32 // indirect
+	github.com/nxadm/tail v1.4.8 // indirect
+	github.com/pelletier/go-toml v1.9.4 // indirect
+	github.com/pmezard/go-difflib v1.0.0 // indirect
+	github.com/sergi/go-diff v1.1.0 // indirect
+	github.com/spf13/afero v1.6.0 // indirect
+	github.com/spf13/cast v1.4.1 // indirect
+	github.com/spf13/jwalterweatherman v1.1.0 // indirect
+	github.com/subosito/gotenv v1.2.0 // indirect
+	github.com/xanzy/ssh-agent v0.3.0 // indirect
+	golang.org/x/crypto v0.0.0-20220315160706-3147a52a75dd // indirect
+	golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd // indirect
+	golang.org/x/oauth2 v0.0.0-20220411215720-9780585627b5 // indirect
+	golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e // indirect
+	golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect
+	golang.org/x/text v0.3.7 // indirect
+	google.golang.org/appengine v1.6.7 // indirect
+	google.golang.org/protobuf v1.27.1 // indirect
+	gopkg.in/ini.v1 v1.63.2 // indirect
+	gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
+	gopkg.in/warnings.v0 v0.1.2 // indirect
+	gopkg.in/yaml.v2 v2.4.0 // indirect
+)

go.sum

@@ -602,7 +602,6 @@ golang.org/x/net v0.0.0-20210326060303-6b1517762897/go.mod h1:uSPa2vr4CLtc/ILN5o
 golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM=
 golang.org/x/net v0.0.0-20210428140749-89ef3d95e781/go.mod h1:OJAsFXCWl8Ukc7SiCT/9KSuxbyM7479/AVlXFRxuMCk=
 golang.org/x/net v0.0.0-20210503060351-7fd8e65b6420/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
-golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd h1:O7DYs+zxREGLKzKoMQrtrEacpb0ZVXA5rIwylE2Xchk=
 golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=