From 3836d240c9aa26615e7d768a57436d171edc3831 Mon Sep 17 00:00:00 2001
From: Drew DeVault <sir@cmpwn.com>
Date: Fri, 2 Mar 2018 09:27:27 -0500
Subject: Switch to vgo

---
 .gitignore       |  2 +-
 Makefile         | 24 ------------------------
 aerc.go          | 45 +++++++++++++++++++++++++++++++++++++++++++++
 cmd/aerc/main.go | 45 ---------------------------------------------
 go.mod           |  9 +++++++++
 5 files changed, 55 insertions(+), 70 deletions(-)
 delete mode 100644 Makefile
 create mode 100644 aerc.go
 delete mode 100644 cmd/aerc/main.go
 create mode 100644 go.mod

diff --git a/.gitignore b/.gitignore
index 144e4e5..cc49a55 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,3 @@
 .go
-/aerc
+/aerc2
 log
diff --git a/Makefile b/Makefile
deleted file mode 100644
index 0386860..0000000
--- a/Makefile
+++ /dev/null
@@ -1,24 +0,0 @@
-PKGNAME = git.sr.ht/~sircmpwn/aerc2
-
-GOPATH = $(shell pwd)/.go
-PKGPATH = .go/src/$(PKGNAME)
-
-all: aerc
-
-.go:
-	mkdir -p $(dir $(PKGPATH))
-	ln -fs $(shell dirname $(GOPATH)) $(PKGPATH)
-
-get: .go
-	env GOPATH=$(GOPATH) go get -d ./...
-
-test: .go
-	env GOPATH=$(GOPATH) go test ./...
-
-aerc: .go
-	env GOPATH=$(GOPATH) go build -o $@ ./cmd/$@
-
-clean:
-	rm -rf .go aerc
-
-.PHONY: aerc get test clean
diff --git a/aerc.go b/aerc.go
new file mode 100644
index 0000000..3030ee9
--- /dev/null
+++ b/aerc.go
@@ -0,0 +1,45 @@
+package main
+
+import (
+	"io"
+	"io/ioutil"
+	"log"
+	"os"
+	"time"
+
+	"github.com/mattn/go-isatty"
+
+	"git.sr.ht/~sircmpwn/aerc2/config"
+	libui "git.sr.ht/~sircmpwn/aerc2/lib/ui"
+	"git.sr.ht/~sircmpwn/aerc2/widgets"
+)
+
+func main() {
+	var logOut io.Writer
+	var logger *log.Logger
+	if !isatty.IsTerminal(os.Stdout.Fd()) {
+		logOut = os.Stdout
+	} else {
+		logOut = ioutil.Discard
+	}
+	logger = log.New(logOut, "", log.LstdFlags)
+	logger.Println("Starting up aerc")
+
+	conf, err := config.LoadConfig(nil)
+	if err != nil {
+		panic(err)
+	}
+
+	ui, err := libui.Initialize(conf, widgets.NewAerc(logger))
+	if err != nil {
+		panic(err)
+	}
+	defer ui.Close()
+
+	for !ui.Exit {
+		if !ui.Tick() {
+			// ~60 FPS
+			time.Sleep(16 * time.Millisecond)
+		}
+	}
+}
diff --git a/cmd/aerc/main.go b/cmd/aerc/main.go
deleted file mode 100644
index 3030ee9..0000000
--- a/cmd/aerc/main.go
+++ /dev/null
@@ -1,45 +0,0 @@
-package main
-
-import (
-	"io"
-	"io/ioutil"
-	"log"
-	"os"
-	"time"
-
-	"github.com/mattn/go-isatty"
-
-	"git.sr.ht/~sircmpwn/aerc2/config"
-	libui "git.sr.ht/~sircmpwn/aerc2/lib/ui"
-	"git.sr.ht/~sircmpwn/aerc2/widgets"
-)
-
-func main() {
-	var logOut io.Writer
-	var logger *log.Logger
-	if !isatty.IsTerminal(os.Stdout.Fd()) {
-		logOut = os.Stdout
-	} else {
-		logOut = ioutil.Discard
-	}
-	logger = log.New(logOut, "", log.LstdFlags)
-	logger.Println("Starting up aerc")
-
-	conf, err := config.LoadConfig(nil)
-	if err != nil {
-		panic(err)
-	}
-
-	ui, err := libui.Initialize(conf, widgets.NewAerc(logger))
-	if err != nil {
-		panic(err)
-	}
-	defer ui.Close()
-
-	for !ui.Exit {
-		if !ui.Tick() {
-			// ~60 FPS
-			time.Sleep(16 * time.Millisecond)
-		}
-	}
-}
diff --git a/go.mod b/go.mod
new file mode 100644
index 0000000..cc52cd8
--- /dev/null
+++ b/go.mod
@@ -0,0 +1,9 @@
+module "git.sr.ht/~sircmpwn/aerc2"
+
+require (
+	"github.com/go-ini/ini" v1.32.0
+	"github.com/kyoh86/xdg" v0.0.0-20171127140545-8db68a8ea76a
+	"github.com/mattn/go-isatty" v0.0.3
+	"github.com/mattn/go-runewidth" v0.0.2
+	"github.com/nsf/termbox-go" v0.0.0-20180129072728-88b7b944be8b
+)
-- 
cgit v1.2.3