Merge branch 'release/0.0.1'

axllent · Mar 2, 2019 · 8994f61 · 8994f61
2 parents abce859 + 9038595
commit 8994f61
Show file tree

Hide file tree

Showing 5 changed files with 285 additions and 139 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -2,7 +2,7 @@ root = true
 
 [*]
 indent_style = space
-indent_size = 4
+indent_size = 8
 charset = utf-8
 trim_trailing_whitespace = true
 insert_final_newline = true

diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,4 @@
-geoiplookup
-/src/
 /pkg/
+/src/
+geoiplookup
+goiplookup
diff --git a/Makefile b/Makefile
@@ -1,11 +1,13 @@
 
 GOPATH := ${PWD}
 export GOPATH
+VERSION=`git describe --tags`
+LDFLAGS=-ldflags "-X main.version=${VERSION}"
 
-geoiplookup: geoiplookup.go
+geoiplookup: goiplookup.go
 	go get github.com/oschwald/geoip2-golang
-	go build geoiplookup.go
-	strip geoiplookup
+	go build ${LDFLAGS} goiplookup.go
+	strip goiplookup
 
 clean:
-	rm -rf pkg src geoiplookup
+	rm -rf pkg src goiplookup
diff --git a/geoiplookup.go b/geoiplookup.go