diff --git a/.gitignore b/.gitignore index ff642bc..21b4aed 100644 --- a/.gitignore +++ b/.gitignore @@ -10,5 +10,4 @@ zzz-stress.toml /vendor/ .DS_Store /zzz_* -/tmpApp -tmp +/tmpApp \ No newline at end of file diff --git a/README.md b/README.md index b1ad370..0ae118e 100644 --- a/README.md +++ b/README.md @@ -38,7 +38,7 @@ zzz help **Windows** 手动下载 [zzz_Windows_x86_64.tar.gz -](https://github.com/sohaha/zzz/releases) ( [国内点这里下载](https://github.73zls.com/https://github.com/sohaha/zzz/releases) ) +](https://github.com/sohaha/zzz/releases) ( [国内点这里下载](https://github.73zls.com/sohaha/zzz/releases) ) 然后打开 cmd 执行 `zzz.exe more install` 或者 设置自行环境变量。 diff --git a/app/watch/event.go b/app/watch/event.go index 980b6f3..5345c83 100644 --- a/app/watch/event.go +++ b/app/watch/event.go @@ -13,26 +13,31 @@ import ( func eventDispatcher(event fsnotify.Event) { ext := path.Ext(event.Name) - types := v.GetStringSlice("monitor.types") - if len(types) > 0 && types[0] != ".*" && !inStringArray(ext, types) { - if zfile.DirExist(event.Name) { - if event.Op == fsnotify.Create { - addNewWatcher(event.Name) - } else if event.Op == fsnotify.Remove { - removeWatcher(event.Name) - } else { - otherWatcher(event.Name, event.Op) - } + event.Name = zfile.RealPath(event.Name) + isDir := zfile.DirExist(event.Name) + switch event.Op { + case fsnotify.Create: + if isDir { + addNewWatcher(event.Name) } + case fsnotify.Remove: + removeWatcher(event.Name) return + case fsnotify.Rename: + case fsnotify.Write: + if len(types) > 0 && types[0] != ".*" && !inStringArray(ext, types) { + return + } + fileChange(event) + default: + otherWatcher(event.Name, event.Op) } - fileChange(event) } func fileChange(event fsnotify.Event) { switch event.Op { case fsnotify.Write, fsnotify.Remove, fsnotify.Rename: - if strings.HasSuffix(event.Name, "____tmp.go") { + if strings.HasSuffix(event.Name, "_static_resources.go") { // ignore zzz build temporary files return } @@ -63,6 +68,6 @@ func fileChange(event fsnotify.Event) { push() })) - zlog.Printf("Change: %v (%v)\n", relativeFilePath, opType) + zlog.Printf("Change: %v (%v)", relativeFilePath, opType) } } diff --git a/app/watch/http.go b/app/watch/http.go index 81556a0..ca79311 100644 --- a/app/watch/http.go +++ b/app/watch/http.go @@ -71,6 +71,7 @@ func httpRun() { service.Log.SetPrefix("") service.NotFoundHandler(func(c *znet.Context) { httpEntrance(c) + _ = c.PrevContent() }) service.GET("/", func(c *znet.Context) { diff --git a/app/watch/start.go b/app/watch/start.go index feb4a55..49f249c 100644 --- a/app/watch/start.go +++ b/app/watch/start.go @@ -43,11 +43,13 @@ func StartCmd(watchCmd *cobra.Command) (app *cobra.Command) { if cfgPath != "" { v.SetConfigFile(cfgPath) } + + util.SetLimit(999999) + // cfgPath = zfile.RealPath(cfgPath) run(cmd) }, } - util.SetLimit(999999) watchCmd.AddCommand(app) return } @@ -89,6 +91,12 @@ func start() { cmds []*exec.Cmd ) poll := v.GetBool("monitor.poll") + types = v.GetStringSlice("monitor.types") + includeDirs = v.GetStringSlice("monitor.includeDirs") + exceptDirs = v.GetStringSlice("monitor.ExceptDirs") + for i := range exceptDirs { + exceptDirs[i] = zfile.RealPath(exceptDirs[i], false) + } // watcher, err = fsnotify.NewWatcher() if poll { watcher = NewPollingWatcher() diff --git a/app/watch/util.go b/app/watch/util.go index 01809a4..f0a1490 100644 --- a/app/watch/util.go +++ b/app/watch/util.go @@ -2,6 +2,8 @@ package watch import ( "errors" + "github.com/sohaha/zlsgo/zfile" + "github.com/sohaha/zlsgo/zlog" "io/ioutil" "net" "os/exec" @@ -37,14 +39,18 @@ func isIgnoreDirectory(folder string) bool { } func listFile(folder string, fun func(string)) { + folder = zfile.RealPath(folder) if isIgnoreDirectory(folder) { + zlog.Error("Ignore", folder) return } - files, _ := ioutil.ReadDir(folder) for _, file := range files { if file.IsDir() { - d := folder + "/" + file.Name() + d := zfile.RealPath(folder + "/" + file.Name()) + if isIgnoreDirectory(d) { + continue + } fun(d) listFile(d, fun) } diff --git a/app/watch/var.go b/app/watch/var.go index 3b4c4fb..dba0ac4 100644 --- a/app/watch/var.go +++ b/app/watch/var.go @@ -1,6 +1,7 @@ package watch import ( + "github.com/sohaha/zlsgo/zfile" "os" "path/filepath" "sync" @@ -19,6 +20,9 @@ var ( projectFolder = "." watcher FileWatcher watchDirs = make([]string, 0) + exceptDirs = make([]string, 0) + types = make([]string, 0) + includeDirs = make([]string, 0) globalErr error done = make(chan bool, 1) signalChan = make(chan os.Signal, 1) @@ -47,6 +51,7 @@ func init() { if projectFolder, globalErr = os.Getwd(); globalErr != nil { util.Log.Fatal(globalErr) } + projectFolder = zfile.RealPath(projectFolder) projectFolder = filepath.ToSlash(projectFolder) projectFolder, _ = filepath.Abs(projectFolder) } diff --git a/app/watch/watch.go b/app/watch/watch.go index 776f75f..de11d95 100644 --- a/app/watch/watch.go +++ b/app/watch/watch.go @@ -1,6 +1,7 @@ package watch import ( + "github.com/sohaha/zlsgo/zfile" "path/filepath" "strings" @@ -26,20 +27,18 @@ func addWatcher() { } func addNewWatcher(dir string) { - exceptDirs := v.GetStringSlice("monitor.ExceptDirs") fullDir := filepath.ToSlash(dir) for i := 0; i < len(exceptDirs); i++ { if dir == exceptDirs[i] { return } } - if !inStringArray(fullDir, watchDirs) { watchDirs = append(watchDirs, fullDir) - isExceptDirs := arrExceptDirs() - if isExceptDirs { - return - } + //isExceptDirs := arrExceptDirs() + //if isExceptDirs { + // return + //} zlog.Println("Watcher: ", fullDir) err := watcher.Add(fullDir) if err != nil { @@ -49,20 +48,16 @@ func addNewWatcher(dir string) { } func removeWatcher(dir string) { - fullDir := filepath.ToSlash(dir) - err := watcher.Remove(fullDir) - if err == nil && inStringArray(fullDir, watchDirs) { + if inStringArray(dir, watchDirs) { if len(watchDirs) > 0 { for i, v := range watchDirs { - if v == fullDir { + if v == dir { watchDirs = append(watchDirs[:i], watchDirs[i+1:]...) break } } } - } - zlog.Println("RemoveWatcher: ", fullDir) } func otherWatcher(name string, event fsnotify.Op) { @@ -70,72 +65,55 @@ func otherWatcher(name string, event fsnotify.Op) { } func arrIncludeDirs() { - includeDirs := v.GetStringSlice("monitor.includeDirs") for i := 0; i < len(includeDirs); i++ { - darr := dirParse2Array(includeDirs[i]) - - isD := strings.Index(darr[0], ".") == 0 - - if len(darr) < 1 || len(darr) > 2 { + arr := dirParse2Array(includeDirs[i]) + isD := strings.Index(arr[0], ".") == 0 + if len(arr) < 1 || len(arr) > 2 { zlog.Fatal("Error listening for file path: ", includeDirs[i]) } - if strings.HasPrefix(darr[0], "/") { + if strings.HasPrefix(arr[0], "/") { zlog.Fatal("watchDirs must be relative paths: ", includeDirs[i]) } - isAll := len(darr) == 2 && darr[1] == "*" + isAll := len(arr) == 2 && arr[1] == "*" addFiles := func(dir string) { + dir = zfile.RealPath(dir) if isAll { watchDirs = append(watchDirs, dir) listFile(dir, func(d string) { - path, _ := filepath.Abs(d) - watchDirs = arrayUniqueAdd(watchDirs, path) + //path, _ := filepath.Abs(d) + watchDirs = arrayUniqueAdd(watchDirs, d) }) - } else { - path, _ := filepath.Abs(dir) - watchDirs = arrayUniqueAdd(watchDirs, path) + } else if !isIgnoreDirectory(dir) { + //path, _ := filepath.Abs(dir) + watchDirs = arrayUniqueAdd(watchDirs, dir) } } - if darr[0] == "." { + if arr[0] == "." { addFiles(projectFolder) } else if isD { - path, _ := filepath.Abs(darr[0]) - addFiles(path) + addFiles(arr[0]) } else { - md := darr[0] - if !filepath.IsAbs(md) { - md = projectFolder + "/" + darr[0] - } - if len(darr) == 2 && darr[1] == "*" { - path, _ := filepath.Abs(md) - watchDirs = arrayUniqueAdd(watchDirs, path) + md := arr[0] + md = zfile.RealPath(md) + if len(arr) == 2 && arr[1] == "*" { + watchDirs = arrayUniqueAdd(watchDirs, md) listFile(md, func(d string) { path, _ := filepath.Abs(d) watchDirs = arrayUniqueAdd(watchDirs, path) }) } else { - path, _ := filepath.Abs(md) - watchDirs = arrayUniqueAdd(watchDirs, path) + watchDirs = arrayUniqueAdd(watchDirs, md) } } } + } func arrExceptDirs() (update bool) { - exceptDirs := v.GetStringSlice("monitor.ExceptDirs") for i := 0; i < len(exceptDirs); i++ { p := exceptDirs[i] - if !filepath.IsAbs(p) { - p = projectFolder + "/" + exceptDirs[i] - } - path, _ := filepath.Abs(p) - update = true - watchDirs = arrayRemoveElement(watchDirs, path) - listFile(p, func(d string) { - path, _ := filepath.Abs(d) - watchDirs = arrayRemoveElement(watchDirs, path) - }) + watchDirs = arrayRemoveElement(watchDirs, p) } - return update } diff --git a/cmd/build.go b/cmd/build.go index ea82508..b7bda14 100644 --- a/cmd/build.go +++ b/cmd/build.go @@ -59,7 +59,7 @@ var buildCmd = &cobra.Command{ for _, referencedAsset := range referencedAssets { packfileData, err := build.GeneratePackFileString(referencedAsset, buildIgnore) util.CheckIfError(err) - targetFile := filepath.Join(referencedAsset.BaseDir, referencedAsset.PackageName+"____tmp.go") + targetFile := filepath.Join(referencedAsset.BaseDir, referencedAsset.PackageName+"_static_resources.go") targetFiles = append(targetFiles, targetFile) err = ioutil.WriteFile(targetFile, []byte(packfileData), 0644) util.CheckIfError(err) diff --git a/go.mod b/go.mod index 2d739e6..27cd31f 100644 --- a/go.mod +++ b/go.mod @@ -10,7 +10,7 @@ require ( github.com/manifoldco/promptui v0.8.0 github.com/mitchellh/go-homedir v1.1.0 github.com/sohaha/gconf v0.0.10 - github.com/sohaha/zlsgo v1.1.3 + github.com/sohaha/zlsgo v1.1.8 github.com/sohaha/zstatic v0.0.2 github.com/spf13/cobra v1.1.1 github.com/spf13/viper v1.7.1 diff --git a/go.sum b/go.sum index 0a1d125..598df85 100644 --- a/go.sum +++ b/go.sum @@ -11,6 +11,7 @@ cloud.google.com/go/firestore v1.1.0/go.mod h1:ulACoGHTpvq5r8rxGJ4ddJZBZqakUQqCl cloud.google.com/go/pubsub v1.0.1/go.mod h1:R0Gpsv3s54REJCy4fxDixWD93lHJMoZTyQ2kNxGRt3I= cloud.google.com/go/storage v1.0.0/go.mod h1:IhtSnM/ZTZV8YYJWCY8RULGVqBDmpoyjwiyrjsg+URw= dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= +github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU= @@ -26,9 +27,11 @@ github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kB github.com/bketelsen/crypt v0.0.3-0.20200106085610-5cbc8cc4026c/go.mod h1:MKsuJmJgSg28kpZDP6UIiPt0e0Oz0kqKNGyRaWEPv84= github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc= github.com/cheekybits/is v0.0.0-20150225183255-68e9c0620927/go.mod h1:h/aW8ynjgkuj+NQRlZcDbAbM1ORAbXjXX77sX7T289U= +github.com/chzyer/logex v1.1.10 h1:Swpa1K6QvQznwJRcfTfQJmTE72DqScAa40E+fbHEXEE= github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI= github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e h1:fY5BOSpyZCqRo5OhCuC+XN+r/bBCmeuuJtjz+bCNIf8= github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= +github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1 h1:q763qf9huN11kDQavWsoZXJNW3xEE4JJyHa5Q25/sd8= github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= github.com/coreos/bbolt v1.3.2/go.mod h1:iRUV2dpdMOn7Bo10OQBFzIJO9kkE559Wcmn+qkEiiKk= @@ -39,6 +42,7 @@ github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7 github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA= github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ= github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8PWV+bWy6jNmig1y/TA+kYO4g3RSRF0IAv0no= @@ -77,6 +81,7 @@ github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod h1:zfwlbNMJ+OI github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg= github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk= +github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1 h1:EGx4pi6eqNxGaHF6qqu48+N2wcFQ5qg5FXgOdqsJ5d8= github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= github.com/gorilla/websocket v1.4.0/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ= github.com/gorilla/websocket v1.4.2 h1:+/TMaTYc4QFitKJxsQ7Yye35DkWvkdLcvGKqM+x0Ufc= @@ -105,11 +110,13 @@ github.com/hashicorp/logutils v1.0.0/go.mod h1:QIAnNjmIWmVIIkWDTG1z5v++HQmx9WQRO github.com/hashicorp/mdns v1.0.0/go.mod h1:tL+uN++7HEJ6SQLQ2/p+z2pH24WQKWjBPkE0mNTz8vQ= github.com/hashicorp/memberlist v0.1.3/go.mod h1:ajVTdAv/9Im8oMAAj5G31PhhMCZJV2pPBoIllUwCN7I= github.com/hashicorp/serf v0.8.2/go.mod h1:6hOLApaqBFA1NXqRQAsxw9QxuDEvNxSQRwA/JwenrHc= +github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NHg9XEKhtSvM= github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo= github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= github.com/json-iterator/go v1.1.9/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU= +github.com/jtolds/gls v4.20.0+incompatible h1:xdiiI2gbIgH/gLH7ADydsJ1uDOEzR8yvV7C0MuV77Wo= github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU= github.com/juju/ansiterm v0.0.0-20180109212912-720a0952cc2a h1:FaWFmfWdAUKbSCtOU2QjDaorUexogfaMgbipgYATUMU= github.com/juju/ansiterm v0.0.0-20180109212912-720a0952cc2a/go.mod h1:UJSiEoRfvx3hP73CvoARgeLjaIOjybY9vj8PUPPFGeU= @@ -118,8 +125,10 @@ github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvW github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc= +github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI= github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= +github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/lucasjones/reggen v0.0.0-20200904144131-37ba4fa293bb h1:w1g9wNDIE/pHSTmAaUhv4TZQuPBS6GV3mMz5hkgziIU= github.com/lucasjones/reggen v0.0.0-20200904144131-37ba4fa293bb/go.mod h1:5ELEyG+X8f+meRWHuqUOewBOhvHkl7M76pdGEansxW4= @@ -164,6 +173,7 @@ github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINE github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= +github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndrE9hABlRI= github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw= @@ -182,14 +192,16 @@ github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc= github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc= github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= +github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d h1:zE9ykElWQ6/NYmHa3jpm/yHnI4xSofP+UP6SpjHcSeM= github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc= +github.com/smartystreets/goconvey v1.6.4 h1:fv0U8FUIMPNf1L9lnHLvLhgicrIVChEkdzIKYqbNC9s= github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA= github.com/sohaha/gconf v0.0.10 h1:b++HPg4jVEAfJ6uBe/pmlg4lAgo9Jb4uVOXDX5cJC8Y= github.com/sohaha/gconf v0.0.10/go.mod h1:st/ngeIMTpO6MCpbg9rvACG8b/iAFrSKWmpLll/sTeM= github.com/sohaha/zlsgo v0.1.17/go.mod h1:8jszf9qU6E2SJTQjxJ1LYKI717Zwa5YZx1gG0dxsukA= github.com/sohaha/zlsgo v0.1.46/go.mod h1:8jszf9qU6E2SJTQjxJ1LYKI717Zwa5YZx1gG0dxsukA= -github.com/sohaha/zlsgo v1.1.3 h1:ZZXQEeDNOjog4F+GswvS0lgMuro6eeZPtowt/Ecn5rU= -github.com/sohaha/zlsgo v1.1.3/go.mod h1:8jszf9qU6E2SJTQjxJ1LYKI717Zwa5YZx1gG0dxsukA= +github.com/sohaha/zlsgo v1.1.8 h1:yZ2bDFZSLq6IC29UZg+juxum9yrA/U8L+gSCmQ+crZs= +github.com/sohaha/zlsgo v1.1.8/go.mod h1:8jszf9qU6E2SJTQjxJ1LYKI717Zwa5YZx1gG0dxsukA= github.com/sohaha/zstatic v0.0.2 h1:fc4ORUO5RfvAtFAFJSzK/LQDmxnm15Uy/TNtRL1l5gE= github.com/sohaha/zstatic v0.0.2/go.mod h1:jI54kSv3th0HkpvDSD2en3Is0RjPGnlKxe+mvTS41H8= github.com/soheilhy/cmux v0.1.4/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4kGIyLM= @@ -215,6 +227,7 @@ github.com/spf13/viper v1.7.1/go.mod h1:8WkrPz2fc9jxqZNCJI/76HCieCp4Q8HaLFoCha5q github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= +github.com/stretchr/testify v1.3.0 h1:TivCn/peBQ7UY8ooIcPgZFpTNSz0Q2U6UrFlUfqbe0Q= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/subosito/gotenv v1.2.0 h1:Slr1R9HxAlEKefgq5jn9U+DnETlIUa6HfgEzj0g5d7s= github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw= @@ -222,6 +235,7 @@ github.com/tdewolff/minify/v2 v2.9.11 h1:8o6hclGwxm6MNwTPHabvdND5SghhHs0bn+3/+uA github.com/tdewolff/minify/v2 v2.9.11/go.mod h1:YZk0lGOc6CvQrqvm5f7V3ihaq3QUd9acS4HESdVDOaM= github.com/tdewolff/parse/v2 v2.5.8 h1:vutkOO9Xi3DehIzCLHqvMM2hFXo54S0iDvIG/hYznnE= github.com/tdewolff/parse/v2 v2.5.8/go.mod h1:WzaJpRSbwq++EIQHYIRTpbYKNA3gn9it1Ik++q4zyho= +github.com/tdewolff/test v1.0.6 h1:76mzYJQ83Op284kMT+63iCNCI7NEERsIN8dLM+RiKr4= github.com/tdewolff/test v1.0.6/go.mod h1:6DAvZliBAAnD7rhVgwaM7DE5/d9NMOAJ09SqYqeK4QE= github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= github.com/ugorji/go v1.1.4/go.mod h1:uQMGLiO92mf5W77hV/PUCpI3pbzQx3CRekS0kk+RGrc= @@ -353,6 +367,7 @@ google.golang.org/grpc v1.21.0/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ij google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM= gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= gopkg.in/ini.v1 v1.51.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= diff --git a/util/util.go b/util/util.go index 223e493..7ce02e0 100644 --- a/util/util.go +++ b/util/util.go @@ -25,7 +25,7 @@ var ( once sync.Once installPath string homePath string - Version = "1.0.28" + Version = "1.0.29" BuildTime = "" BuildGoVersion = "" )