From 42da5c6489090627f8093bf03fb2bb6ff25ec9a9 Mon Sep 17 00:00:00 2001 From: evilsocket Date: Sun, 14 Jan 2018 00:33:24 +0100 Subject: [PATCH] balls --- .gitignore | 1 - Makefile | 11 +---------- main.go | 4 +--- net/oui_compiled.go | 2 +- 4 files changed, 3 insertions(+), 15 deletions(-) diff --git a/.gitignore b/.gitignore index a37ff50c..ff769a40 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,3 @@ *.sw* -core/build.go bettercap bettercap.history diff --git a/Makefile b/Makefile index 098f7ed2..7c68626d 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,4 @@ TARGET=bettercap -BUILD_DATE=`date +%Y-%m-%d\ %H:%M` -BUILD_FILE=core/build.go all: fmt vet build @echo "@ Done" @@ -8,17 +6,10 @@ all: fmt vet build test: build @go test ./... -build: build_file +build: resources @echo "@ Building ..." @go build $(FLAGS) -o $(TARGET) . -build_file: resources - @rm -f $(BUILD_FILE) - @echo "package core" > $(BUILD_FILE) - @echo "const (" >> $(BUILD_FILE) - @echo " BuildDate = \"$(BUILD_DATE)\"" >> $(BUILD_FILE) - @echo ")" >> $(BUILD_FILE) - resources: @echo "@ Compiling resources into go files ..." @$(GOPATH)/bin/go-bindata -o net/oui_compiled.go -pkg net net/oui.dat diff --git a/main.go b/main.go index 42a726f1..cd3a634e 100644 --- a/main.go +++ b/main.go @@ -3,7 +3,6 @@ package main import ( "fmt" "os" - "runtime" "strings" "github.com/evilsocket/bettercap-ng/core" @@ -21,8 +20,7 @@ func main() { os.Exit(1) } - fmt.Printf("%s v%s\n", core.Name, core.Version) - fmt.Printf("Build: date=%s os=%s arch=%s\n\n", core.BuildDate, runtime.GOOS, runtime.GOARCH) + fmt.Printf(core.Bold("%s v%s\n\n"), core.Name, core.Version) sess.Register(modules.NewEventsStream(sess)) sess.Register(modules.NewProber(sess)) diff --git a/net/oui_compiled.go b/net/oui_compiled.go index 292bc57b..568c267f 100644 --- a/net/oui_compiled.go +++ b/net/oui_compiled.go @@ -83,7 +83,7 @@ func netOuiDat() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "net/oui.dat", size: 585353, mode: os.FileMode(420), modTime: time.Unix(1510072358, 0)} + info := bindataFileInfo{name: "net/oui.dat", size: 585353, mode: os.FileMode(420), modTime: time.Unix(1515886330, 0)} a := &asset{bytes: bytes, info: info} return a, nil }