diff --git a/app/resource.go b/app/resource.go index f0cb242..8e504d4 100644 --- a/app/resource.go +++ b/app/resource.go @@ -12,11 +12,11 @@ import ( "compress/gzip" "fmt" "io" - "strings" - "os" - "time" "io/ioutil" + "os" "path/filepath" + "strings" + "time" ) func bindataRead(data []byte, name string) ([]byte, error) { @@ -45,9 +45,9 @@ type asset struct { } type bindataFileInfo struct { - name string - size int64 - mode os.FileMode + name string + size int64 + mode os.FileMode modTime time.Time } @@ -86,7 +86,7 @@ func bindataGottyJs() (*asset, error) { } info := bindataFileInfo{name: "bindata/gotty.js", size: 1398, mode: os.FileMode(436), modTime: time.Unix(1439873108, 0)} - a := &asset{bytes: bytes, info: info} + a := &asset{bytes: bytes, info: info} return a, nil } @@ -106,7 +106,7 @@ func bindataHtermJs() (*asset, error) { } info := bindataFileInfo{name: "bindata/hterm.js", size: 522491, mode: os.FileMode(292), modTime: time.Unix(1439767987, 0)} - a := &asset{bytes: bytes, info: info} + a := &asset{bytes: bytes, info: info} return a, nil } @@ -126,7 +126,7 @@ func bindataIndexHtml() (*asset, error) { } info := bindataFileInfo{name: "bindata/index.html", size: 254, mode: os.FileMode(436), modTime: time.Unix(1439872871, 0)} - a := &asset{bytes: bytes, info: info} + a := &asset{bytes: bytes, info: info} return a, nil } @@ -149,7 +149,7 @@ func Asset(name string) ([]byte, error) { // It simplifies safe initialization of global variables. func MustAsset(name string) []byte { a, err := Asset(name) - if (err != nil) { + if err != nil { panic("asset: Asset(" + name + "): " + err.Error()) } @@ -182,8 +182,8 @@ func AssetNames() []string { // _bindata is a table, holding each asset generator, mapped to its name. var _bindata = map[string]func() (*asset, error){ - "bindata/gotty.js": bindataGottyJs, - "bindata/hterm.js": bindataHtermJs, + "bindata/gotty.js": bindataGottyJs, + "bindata/hterm.js": bindataHtermJs, "bindata/index.html": bindataIndexHtml, } @@ -223,64 +223,61 @@ func AssetDir(name string) ([]string, error) { } type bintree struct { - Func func() (*asset, error) + Func func() (*asset, error) Children map[string]*bintree } + var _bintree = &bintree{nil, map[string]*bintree{ "bindata": &bintree{nil, map[string]*bintree{ - "gotty.js": &bintree{bindataGottyJs, map[string]*bintree{ - }}, - "hterm.js": &bintree{bindataHtermJs, map[string]*bintree{ - }}, - "index.html": &bintree{bindataIndexHtml, map[string]*bintree{ - }}, + "gotty.js": &bintree{bindataGottyJs, map[string]*bintree{}}, + "hterm.js": &bintree{bindataHtermJs, map[string]*bintree{}}, + "index.html": &bintree{bindataIndexHtml, map[string]*bintree{}}, }}, }} // RestoreAsset restores an asset under the given directory func RestoreAsset(dir, name string) error { - data, err := Asset(name) - if err != nil { - return err - } - info, err := AssetInfo(name) - if err != nil { - return err - } - err = os.MkdirAll(_filePath(dir, filepath.Dir(name)), os.FileMode(0755)) - if err != nil { - return err - } - err = ioutil.WriteFile(_filePath(dir, name), data, info.Mode()) - if err != nil { - return err - } - err = os.Chtimes(_filePath(dir, name), info.ModTime(), info.ModTime()) - if err != nil { - return err - } - return nil + data, err := Asset(name) + if err != nil { + return err + } + info, err := AssetInfo(name) + if err != nil { + return err + } + err = os.MkdirAll(_filePath(dir, filepath.Dir(name)), os.FileMode(0755)) + if err != nil { + return err + } + err = ioutil.WriteFile(_filePath(dir, name), data, info.Mode()) + if err != nil { + return err + } + err = os.Chtimes(_filePath(dir, name), info.ModTime(), info.ModTime()) + if err != nil { + return err + } + return nil } // RestoreAssets restores an asset under the given directory recursively func RestoreAssets(dir, name string) error { - children, err := AssetDir(name) - // File - if err != nil { - return RestoreAsset(dir, name) - } - // Dir - for _, child := range children { - err = RestoreAssets(dir, filepath.Join(name, child)) - if err != nil { - return err - } - } - return nil + children, err := AssetDir(name) + // File + if err != nil { + return RestoreAsset(dir, name) + } + // Dir + for _, child := range children { + err = RestoreAssets(dir, filepath.Join(name, child)) + if err != nil { + return err + } + } + return nil } func _filePath(dir, name string) string { - cannonicalName := strings.Replace(name, "\\", "/", -1) - return filepath.Join(append([]string{dir}, strings.Split(cannonicalName, "/")...)...) + cannonicalName := strings.Replace(name, "\\", "/", -1) + return filepath.Join(append([]string{dir}, strings.Split(cannonicalName, "/")...)...) } - diff --git a/wercker.yml b/wercker.yml index b63a05b..59c1a9c 100644 --- a/wercker.yml +++ b/wercker.yml @@ -8,6 +8,10 @@ build: code: | go get github.com/tools/godep godep restore + - script: + name: check format + code: | + if [ `go fmt ./... | wc -l` -gt 0 ]; then echo "go fmt error"; exit 1; fi - tcnksm/gox: os: "darwin linux" arch: "amd64"