forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-08-17 17:33:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

dashboard: fix linter issue

Browse source
This commit is contained in:
Kurkó Mihály 2018-01-09 16:05:29 +02:00
parent 45796f060e
commit da533d7255
2 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
dashboard/assets.go
View file

@ -45,6 +45,7 @@ func (fi bindataFileInfo) Sys() interface{} {
return nil return nil
} }
//nolint:misspell
var _dashboardHtml = []byte(`<!DOCTYPE html> var _dashboardHtml = []byte(`<!DOCTYPE html>
<html lang="en" style="height: 100%"> <html lang="en" style="height: 100%">
<head> <head>
@ -85,6 +86,7 @@ func dashboardHtml() (*asset, error) {
return a, nil return a, nil
} }
//nolint:misspell
var _bundleJs = []byte((((((((((`!function(modules) { var _bundleJs = []byte((((((((((`!function(modules) {
function __webpack_require__(moduleId) { function __webpack_require__(moduleId) {
if (installedModules[moduleId]) return installedModules[moduleId].exports; if (installedModules[moduleId]) return installedModules[moduleId].exports;

4
dashboard/dashboard.go
View file

@ -19,12 +19,8 @@ package dashboard
//go:generate npm --prefix ./assets install //go:generate npm --prefix ./assets install
//go:generate ./assets/node_modules/.bin/webpack --config ./assets/webpack.config.js --context ./assets //go:generate ./assets/node_modules/.bin/webpack --config ./assets/webpack.config.js --context ./assets
//go:generate go-bindata -nometadata -o assets.go -prefix assets -nocompress -pkg dashboard assets/dashboard.html assets/bundle.js //go:generate go-bindata -nometadata -o assets.go -prefix assets -nocompress -pkg dashboard assets/dashboard.html assets/bundle.js
<<<<<<< HEAD
//go:generate sh -c "sed 's#var _bundleJs#//nolint:misspell\\\n&#' assets.go > assets.go.tmp && mv assets.go.tmp assets.go" //go:generate sh -c "sed 's#var _bundleJs#//nolint:misspell\\\n&#' assets.go > assets.go.tmp && mv assets.go.tmp assets.go"
//go:generate sh -c "sed 's#var _dashboardHtml#//nolint:misspell\\\n&#' assets.go > assets.go.tmp && mv assets.go.tmp assets.go" //go:generate sh -c "sed 's#var _dashboardHtml#//nolint:misspell\\\n&#' assets.go > assets.go.tmp && mv assets.go.tmp assets.go"
=======
//go:generate sh -c "sed 's#var _public#//nolint:misspell\\\n&#' assets.go > assets.go.tmp && mv assets.go.tmp assets.go"
>>>>>>> dashboard: resolve asset path
//go:generate gofmt -w -s assets.go //go:generate gofmt -w -s assets.go
import ( import (