# HG changeset patch
# User Peter Sanchez <peter@netlandish.com>
# Date 1650908890 21600
#      Mon Apr 25 11:48:10 2022 -0600
# Node ID ac10d687fe9c2bd95d6bca5f2b4a953241049aa8
# Parent  36b8e0dc3430b4455644f497589a61b836abc58f
Reorganization of command files

diff --git a/Makefile b/Makefile
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,14 @@
+VERSION?=`hg log -r . -T "{latesttag}{sub('^-0-.*', '', '-{latesttagdistance}-m{node|short}')}" || echo 0.1.0`
+GO?=go
+GOFLAGS?=--tags="fts5"
+LDFLAGS+=-X main.Version=$(VERSION)
+
+GOSRC:=$(shell find ./cmd/tago/ -name '*.go')
+
 all: tago
 
-tago:
-	go build --tags="fts5" -o tago main.go
+tago: $(GOSRC)
+	$(GO) build $(GOFLAGS) -ldflags "$(LDFLAGS)" -o $@ $(GOSRC)
 
 clean:
 	rm -f tago
diff --git a/cmd/clear.go b/cmd/tago/clear.go
rename from cmd/clear.go
rename to cmd/tago/clear.go
--- a/cmd/clear.go
+++ b/cmd/tago/clear.go
@@ -1,4 +1,4 @@
-package cmd
+package main
 
 import (
 	"fmt"
diff --git a/cmd/db.go b/cmd/tago/db.go
rename from cmd/db.go
rename to cmd/tago/db.go
--- a/cmd/db.go
+++ b/cmd/tago/db.go
@@ -1,4 +1,4 @@
-package cmd
+package main
 
 import (
 	"fmt"
diff --git a/cmd/delete.go b/cmd/tago/delete.go
rename from cmd/delete.go
rename to cmd/tago/delete.go
--- a/cmd/delete.go
+++ b/cmd/tago/delete.go
@@ -1,4 +1,4 @@
-package cmd
+package main
 
 import (
 	"fmt"
diff --git a/cmd/files.go b/cmd/tago/files.go
rename from cmd/files.go
rename to cmd/tago/files.go
--- a/cmd/files.go
+++ b/cmd/tago/files.go
@@ -1,4 +1,4 @@
-package cmd
+package main
 
 import (
 	"fmt"
diff --git a/cmd/root.go b/cmd/tago/main.go
rename from cmd/root.go
rename to cmd/tago/main.go
--- a/cmd/root.go
+++ b/cmd/tago/main.go
@@ -1,4 +1,4 @@
-package cmd
+package main
 
 import (
 	"os"
@@ -10,6 +10,8 @@
 var (
 	dbFile   string
 	fullPath bool
+	// Version set at build time
+	Version string
 )
 
 var rootCmd = &cobra.Command{
@@ -34,8 +36,7 @@
 	)
 }
 
-// Execute main cobra caller
-func Execute() {
+func main() {
 	if err := rootCmd.Execute(); err != nil {
 		os.Exit(1)
 	}
diff --git a/cmd/merge.go b/cmd/tago/merge.go
rename from cmd/merge.go
rename to cmd/tago/merge.go
--- a/cmd/merge.go
+++ b/cmd/tago/merge.go
@@ -1,4 +1,4 @@
-package cmd
+package main
 
 import (
 	"fmt"
diff --git a/cmd/search.go b/cmd/tago/search.go
rename from cmd/search.go
rename to cmd/tago/search.go
--- a/cmd/search.go
+++ b/cmd/tago/search.go
@@ -1,4 +1,4 @@
-package cmd
+package main
 
 import (
 	"fmt"
diff --git a/cmd/stats.go b/cmd/tago/stats.go
rename from cmd/stats.go
rename to cmd/tago/stats.go
--- a/cmd/stats.go
+++ b/cmd/tago/stats.go
@@ -1,4 +1,4 @@
-package cmd
+package main
 
 import (
 	"fmt"
diff --git a/cmd/tag.go b/cmd/tago/tag.go
rename from cmd/tag.go
rename to cmd/tago/tag.go
--- a/cmd/tag.go
+++ b/cmd/tago/tag.go
@@ -1,4 +1,4 @@
-package cmd
+package main
 
 import (
 	"fmt"
diff --git a/cmd/tags.go b/cmd/tago/tags.go
rename from cmd/tags.go
rename to cmd/tago/tags.go
--- a/cmd/tags.go
+++ b/cmd/tago/tags.go
@@ -1,4 +1,4 @@
-package cmd
+package main
 
 import (
 	"fmt"