From 43bd76942e9ff2529442011700549a77166cdd3c Mon Sep 17 00:00:00 2001 From: d3rp Date: Thu, 30 May 2024 13:05:46 +0300 Subject: [PATCH] updating paths and dependency handling Apparently time has passed since this was last updated, so the conventions in github's paths (zip files) and go dependencies have progressed in the meanwhile. codeganstas was flagged as incorrect source for the repo by go's checks, so it's updated to urfave mods are included in the repo for `go get` to work tool.sh is updated for these to work utils.go had incorrect paths version bumped to 1.0.1 --- go.mod | 10 ++++++++++ go.sum | 24 ++++++++++++++++++++++++ joe.go | 6 +++--- tool.sh | 6 +++++- utils.go | 4 ++-- 5 files changed, 44 insertions(+), 6 deletions(-) create mode 100644 go.mod create mode 100644 go.sum diff --git a/go.mod b/go.mod new file mode 100644 index 0000000..638d534 --- /dev/null +++ b/go.mod @@ -0,0 +1,10 @@ +module urfave/cli + +go 1.22.3 + +require ( + github.com/cpuguy83/go-md2man/v2 v2.0.4 // indirect + github.com/russross/blackfriday/v2 v2.1.0 // indirect + github.com/termie/go-shutil v0.0.0-20140729215957-bcacb06fecae // indirect + github.com/urfave/cli v1.22.15 // indirect +) diff --git a/go.sum b/go.sum new file mode 100644 index 0000000..c8f6a8e --- /dev/null +++ b/go.sum @@ -0,0 +1,24 @@ +github.com/BurntSushi/toml v1.3.2/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ= +github.com/cpuguy83/go-md2man/v2 v2.0.4 h1:wfIWP927BUkWJb2NmU/kNDYIBTh/ziUX91+lVfRxZq4= +github.com/cpuguy83/go-md2man/v2 v2.0.4/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= +github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= +github.com/russross/blackfriday/v2 v2.1.0 h1:JIOH55/0cWyOuilr9/qlrm0BSXldqnqwMsf35Ld67mk= +github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= +github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= +github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= +github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo= +github.com/stretchr/objx v0.5.2/go.mod h1:FRsXN1f5AsAjCGJKqEizvkpNtU+EGNCLh3NxZ/8L+MA= +github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= +github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= +github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= +github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= +github.com/termie/go-shutil v0.0.0-20140729215957-bcacb06fecae h1:vgGSvdW5Lqg+I1aZOlG32uyE6xHpLdKhZzcTEktz5wM= +github.com/termie/go-shutil v0.0.0-20140729215957-bcacb06fecae/go.mod h1:quDq6Se6jlGwiIKia/itDZxqC5rj6/8OdFyMMAwTxCs= +github.com/urfave/cli v1.22.15 h1:nuqt+pdC/KqswQKhETJjo7pvn/k4xMUxgW6liI7XpnM= +github.com/urfave/cli v1.22.15/go.mod h1:wSan1hmo5zeyLGBjRJbzRTNk8gwoYa2B9n4q9dmRIc0= +gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= +gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= diff --git a/joe.go b/joe.go index 340a563..4e03d18 100644 --- a/joe.go +++ b/joe.go @@ -2,7 +2,7 @@ package main import ( "fmt" - "github.com/codegangsta/cli" + "github.com/urfave/cli" "io/ioutil" "log" "os" @@ -25,8 +25,8 @@ const joe string = ` ▐░░░░░░░▌ ▐░░░░░░░░░░░▌▐░░░░░░░░░░░▌ ▀▀▀▀▀▀▀ ▀▀▀▀▀▀▀▀▀▀▀ ▀▀▀▀▀▀▀▀▀▀▀ ` -const version string = "1.0.0" -const gitignoreUrl = "https://github.com/github/gitignore/archive/master.zip" +const version string = "1.0.1" +const gitignoreUrl = "https://github.com/github/gitignore/archive/refs/heads/main.zip" const dataDir string = ".joe-data" var dataPath = path.Join(os.Getenv("HOME"), dataDir) diff --git a/tool.sh b/tool.sh index 692a6ba..8ee5259 100755 --- a/tool.sh +++ b/tool.sh @@ -41,7 +41,11 @@ fi # show help for no arguments if stdin is a terminal if [ "$1" == "deps" ]; then - go get github.com/codegangsta/cli + [[ ! -f "go.mod" ]] \ + && go mod init urfave/cli \ + && go mod init termie/go-shutil + + go get github.com/urfave/cli go get github.com/termie/go-shutil elif [ "$1" == "build" ]; then build diff --git a/utils.go b/utils.go index 2915821..3b85556 100644 --- a/utils.go +++ b/utils.go @@ -48,7 +48,7 @@ func unzip(archive, target string) (err error) { } func DownloadFiles(url string, dataPath string) (err error) { - archivePath := path.Join("/tmp", "master.zip") + archivePath := path.Join("/tmp", "gitignore-main.zip") // Create the file out, err := os.Create(archivePath) @@ -76,7 +76,7 @@ func DownloadFiles(url string, dataPath string) (err error) { return err } - err = shutil.CopyTree(path.Join("/tmp", "gitignore-master"), dataPath, nil) + err = shutil.CopyTree(path.Join("/tmp", "gitignore-main"), dataPath, nil) if err != nil { return err }