summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile12
-rw-r--r--main.go8
2 files changed, 13 insertions, 7 deletions
diff --git a/Makefile b/Makefile
index fde876f..9eca5e8 100644
--- a/Makefile
+++ b/Makefile
@@ -4,10 +4,17 @@ BUILDTIME = $(shell date +%Y.%m.%d)
all: build
./control-panel-droplet
-build:
+build: goimports vet
GO111MODULE=off go build \
-ldflags "-X main.VERSION=${VERSION} -X main.BUILDTIME=${BUILDTIME} -X gui.GUIVERSION=${VERSION}"
+goimports:
+ goimports -w *.go
+
+vet:
+ @GO111MODULE=off go vet
+ @echo this go binary package builds okay
+
verbose:
GO111MODULE=off go build -v -x \
-ldflags "-X main.VERSION=${VERSION} -X main.BUILDTIME=${BUILDTIME} -X gui.GUIVERSION=${VERSION}"
@@ -17,10 +24,9 @@ install:
-ldflags "-X main.VERSION=${VERSION} -X main.BUILDTIME=${BUILDTIME} -X gui.GUIVERSION=${VERSION}"
clean:
- -rm -f control-panel-droplet
+ -rm -f control-panel-droplet go.*
redomod:
- rm -f go.*
GO111MODULE= go mod init
GO111MODULE= go mod tidy
diff --git a/main.go b/main.go
index f35d065..96208a6 100644
--- a/main.go
+++ b/main.go
@@ -4,10 +4,10 @@ import (
"os"
"time"
- "go.wit.com/log"
"go.wit.com/gui"
"go.wit.com/lib/debugger"
"go.wit.com/lib/gui/digitalocean"
+ "go.wit.com/log"
)
var title string = "Droplet Control Panel"
@@ -41,7 +41,7 @@ func cloudApp(n *gui.Node) *gui.Node {
box := win.Box()
grid := box.NewGrid("grid", 2, 1).Pad()
- grid.NewButton("Show Droplets", func () {
+ grid.NewButton("Show Droplets", func() {
if myDo == nil {
myDo = digitalocean.New(myGui)
} else {
@@ -50,13 +50,13 @@ func cloudApp(n *gui.Node) *gui.Node {
})
grid.NewLabel("initializes the DO golang gui package")
- grid.NewButton("Create", func () {
+ grid.NewButton("Create", func() {
// myDo.Create("jcarr.wit.com")
digitalocean.InitCreateWindow()
})
grid.NewLabel("makes a new droplet")
- box.NewButton("gui debugger", func () {
+ box.NewButton("gui debugger", func() {
debugger.DebugWindow()
})
grid.NewLabel("make sure you have $ENV(DIGITALOCEAN_TOKEN} set to your API token")