Merge pull request #895 from cmingxu/master

make import statement clean

js/data.go

@@ -4,6 +4,7 @@ import (
 	"bytes"
 	"compress/gzip"
 	"encoding/base64"
+
 	"github.com/robertkrimen/otto"
 )
 
@@ -13,6 +14,7 @@ func btoa(call otto.FunctionCall) otto.Value {
 	if err != nil {
 		return ReportError("Could not convert to string: %s", varValue)
 	}
+
 	return v
 }
 
@@ -21,10 +23,12 @@ func atob(call otto.FunctionCall) otto.Value {
 	if err != nil {
 		return ReportError("Could not decode string: %s", call.Argument(0).String())
 	}
+
 	v, err := otto.ToValue(string(varValue))
 	if err != nil {
 		return ReportError("Could not convert to string: %s", varValue)
 	}
+
 	return v
 }
 

js/fs.go

@@ -67,4 +67,4 @@ func writeFile(call otto.FunctionCall) otto.Value {
 	}
 
 	return otto.NullValue()
-}
+}

js/http.go

@@ -3,12 +3,13 @@ package js
 import (
 	"bytes"
 	"fmt"
-	"github.com/robertkrimen/otto"
 	"io"
 	"io/ioutil"
 	"net/http"
 	"net/url"
 	"strings"
+
+	"github.com/robertkrimen/otto"
 )
 
 type httpPackage struct {
@@ -26,7 +27,10 @@ func (c httpPackage) Encode(s string) string {
 	return url.QueryEscape(s)
 }
 
-func (c httpPackage) Request(method string, uri string, headers map[string]string, form map[string]string, json string) httpResponse {
+func (c httpPackage) Request(method string, uri string,
+	headers map[string]string,
+	form map[string]string,
+	json string) httpResponse {
 	var reader io.Reader
 
 	if form != nil {

js/init.go

@@ -3,7 +3,6 @@ package js
 import (
 	"github.com/evilsocket/islazy/log"
 	"github.com/evilsocket/islazy/plugin"
-
 	"github.com/robertkrimen/otto"
 )
 

packets/mdns.go

@@ -5,7 +5,6 @@ import (
 	"strings"
 
 	"github.com/evilsocket/islazy/str"
-
 	"github.com/google/gopacket"
 	"github.com/google/gopacket/layers"
 )

routing/update_darwin.go

@@ -1,10 +1,11 @@
 package routing
 
 import (
-	"github.com/bettercap/bettercap/core"
-	"github.com/evilsocket/islazy/str"
 	"regexp"
 	"strings"
+
+	"github.com/bettercap/bettercap/core"
+	"github.com/evilsocket/islazy/str"
 )
 
 var parser = regexp.MustCompile(`^([^\s]+)\s+([^\s]+)\s+([^\s]+)\s+([^\s]+).*$`)

session/script.go

@@ -2,15 +2,17 @@ package session
 
 import (
 	"fmt"
-	"github.com/bettercap/bettercap/caplets"
-	_ "github.com/bettercap/bettercap/js"
-	"github.com/evilsocket/islazy/fs"
-	"github.com/evilsocket/islazy/plugin"
-	"github.com/evilsocket/islazy/str"
 	"io/ioutil"
 	"path/filepath"
 	"regexp"
 	"strings"
+
+	"github.com/bettercap/bettercap/caplets"
+	_ "github.com/bettercap/bettercap/js"
+
+	"github.com/evilsocket/islazy/fs"
+	"github.com/evilsocket/islazy/plugin"
+	"github.com/evilsocket/islazy/str"
 )
 
 // require("telegram.js")
@@ -37,7 +39,7 @@ func preprocess(basePath string, code string, level int) (string, error) {
 				filepath.Join(caplets.InstallBase, fileName),
 			}
 
-			if strings.Contains(fileName, ".js") == false {
+			if !strings.Contains(fileName, ".js") {
 				searchPaths = append(searchPaths, []string{
 					filepath.Join(basePath, fileName) + ".js",
 					filepath.Join(caplets.InstallBase, fileName) + ".js",