From 00b2acd54dd1aa412f6f2bddc24b1bbb31c7ae3f Mon Sep 17 00:00:00 2001
From: Tom Clegg <tom@tomclegg.ca>
Date: Mon, 8 Feb 2021 11:17:53 -0500
Subject: [PATCH] Move command line tool to subdir.

Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom@curii.com>
---
 Makefile            | 2 +-
 annotate.go         | 2 +-
 arvados.go          | 2 +-
 cmd.go              | 4 ++--
 diff.go             | 2 +-
 diff_test.go        | 2 +-
 dumpgob.go          | 2 +-
 export.go           | 2 +-
 exportnumpy.go      | 2 +-
 exportnumpy_test.go | 2 +-
 filter.go           | 2 +-
 gob.go              | 2 +-
 import.go           | 2 +-
 lightning/main.go   | 7 +++++++
 lis.go              | 2 +-
 lis_test.go         | 2 +-
 merge.go            | 2 +-
 numpycomvar.go      | 2 +-
 pca.go              | 2 +-
 pipeline_test.go    | 2 +-
 plot.go             | 2 +-
 ref2genome.go       | 2 +-
 stats.go            | 2 +-
 taglib.go           | 2 +-
 taglib_test.go      | 2 +-
 throttle.go         | 2 +-
 tilelib.go          | 2 +-
 tilelib_test.go     | 2 +-
 vcf2fasta.go        | 2 +-
 29 files changed, 36 insertions(+), 29 deletions(-)
 create mode 100644 lightning/main.go

diff --git a/Makefile b/Makefile
index 62f4e549e2..7c8ba29fb7 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
 GOPATH?=$(HOME)/go
 .PHONY: $(GOPATH)/bin/lightning
 $(GOPATH)/bin/lightning:
-	go install -ldflags "-X git.arvados.org/arvados.git/lib/cmd.version=$(shell ./version.sh)"
+	cd lightning && go install -ldflags "-X git.arvados.org/arvados.git/lib/cmd.version=$(shell ./version.sh)"
diff --git a/annotate.go b/annotate.go
index 8fab0f0f1e..ac34ada40f 100644
--- a/annotate.go
+++ b/annotate.go
@@ -1,4 +1,4 @@
-package main
+package lightning
 
 import (
 	"bufio"
diff --git a/arvados.go b/arvados.go
index 00d5d6fdda..ec09637ae9 100644
--- a/arvados.go
+++ b/arvados.go
@@ -1,4 +1,4 @@
-package main
+package lightning
 
 import (
 	"context"
diff --git a/cmd.go b/cmd.go
index 97505c3926..1fff7b4b7e 100644
--- a/cmd.go
+++ b/cmd.go
@@ -1,4 +1,4 @@
-package main
+package lightning
 
 import (
 	"fmt"
@@ -37,7 +37,7 @@ var (
 	})
 )
 
-func main() {
+func Main() {
 	if !isatty.IsTerminal(os.Stderr.Fd()) {
 		logrus.StandardLogger().Formatter = &logrus.TextFormatter{DisableTimestamp: true}
 	}
diff --git a/diff.go b/diff.go
index 2318c9f00b..17b2bb6b11 100644
--- a/diff.go
+++ b/diff.go
@@ -1,4 +1,4 @@
-package main
+package lightning
 
 import (
 	"bufio"
diff --git a/diff_test.go b/diff_test.go
index 00c5f0c598..341888119b 100644
--- a/diff_test.go
+++ b/diff_test.go
@@ -1,4 +1,4 @@
-package main
+package lightning
 
 import (
 	"bytes"
diff --git a/dumpgob.go b/dumpgob.go
index d2d4af36ce..4d5f574ac0 100644
--- a/dumpgob.go
+++ b/dumpgob.go
@@ -1,4 +1,4 @@
-package main
+package lightning
 
 import (
 	"bufio"
diff --git a/export.go b/export.go
index 958da95a17..8ff69bf88b 100644
--- a/export.go
+++ b/export.go
@@ -1,4 +1,4 @@
-package main
+package lightning
 
 import (
 	"bufio"
diff --git a/exportnumpy.go b/exportnumpy.go
index 85d42f4f8b..ec6c83b886 100644
--- a/exportnumpy.go
+++ b/exportnumpy.go
@@ -1,4 +1,4 @@
-package main
+package lightning
 
 import (
 	"bufio"
diff --git a/exportnumpy_test.go b/exportnumpy_test.go
index 09e1702221..9dd71da82b 100644
--- a/exportnumpy_test.go
+++ b/exportnumpy_test.go
@@ -1,4 +1,4 @@
-package main
+package lightning
 
 import (
 	"bytes"
diff --git a/filter.go b/filter.go
index afb424d47e..08468fa690 100644
--- a/filter.go
+++ b/filter.go
@@ -1,4 +1,4 @@
-package main
+package lightning
 
 import (
 	"bufio"
diff --git a/gob.go b/gob.go
index 907c7befcb..88b78c78c9 100644
--- a/gob.go
+++ b/gob.go
@@ -1,4 +1,4 @@
-package main
+package lightning
 
 import (
 	"bufio"
diff --git a/import.go b/import.go
index 90ed684434..c12811cad2 100644
--- a/import.go
+++ b/import.go
@@ -1,4 +1,4 @@
-package main
+package lightning
 
 import (
 	"bufio"
diff --git a/lightning/main.go b/lightning/main.go
new file mode 100644
index 0000000000..84511fbd1f
--- /dev/null
+++ b/lightning/main.go
@@ -0,0 +1,7 @@
+package main
+
+import "github.com/arvados/lightning"
+
+func main() {
+	lightning.Main()
+}
diff --git a/lis.go b/lis.go
index 2103af07bd..3e609af215 100644
--- a/lis.go
+++ b/lis.go
@@ -1,4 +1,4 @@
-package main
+package lightning
 
 func longestIncreasingSubsequence(srclen int, X func(int) int) []int {
 	if srclen == 0 {
diff --git a/lis_test.go b/lis_test.go
index 9a33e5ec5c..cc35119781 100644
--- a/lis_test.go
+++ b/lis_test.go
@@ -1,4 +1,4 @@
-package main
+package lightning
 
 import (
 	"gopkg.in/check.v1"
diff --git a/merge.go b/merge.go
index 322d62c7f2..6530d60027 100644
--- a/merge.go
+++ b/merge.go
@@ -1,4 +1,4 @@
-package main
+package lightning
 
 import (
 	"bufio"
diff --git a/numpycomvar.go b/numpycomvar.go
index 7f99168713..b330d6a7fa 100644
--- a/numpycomvar.go
+++ b/numpycomvar.go
@@ -1,4 +1,4 @@
-package main
+package lightning
 
 import (
 	"flag"
diff --git a/pca.go b/pca.go
index 41e3a7877f..0248fa5570 100644
--- a/pca.go
+++ b/pca.go
@@ -1,4 +1,4 @@
-package main
+package lightning
 
 import (
 	"bufio"
diff --git a/pipeline_test.go b/pipeline_test.go
index c917b3610d..d66fef5442 100644
--- a/pipeline_test.go
+++ b/pipeline_test.go
@@ -1,4 +1,4 @@
-package main
+package lightning
 
 import (
 	"bytes"
diff --git a/plot.go b/plot.go
index 73f1f3c3d4..4339484235 100644
--- a/plot.go
+++ b/plot.go
@@ -1,4 +1,4 @@
-package main
+package lightning
 
 import (
 	"flag"
diff --git a/ref2genome.go b/ref2genome.go
index 0561ea0f93..058de169fb 100644
--- a/ref2genome.go
+++ b/ref2genome.go
@@ -1,4 +1,4 @@
-package main
+package lightning
 
 import (
 	"bufio"
diff --git a/stats.go b/stats.go
index 460eef47fb..d0ccc92342 100644
--- a/stats.go
+++ b/stats.go
@@ -1,4 +1,4 @@
-package main
+package lightning
 
 import (
 	"bufio"
diff --git a/taglib.go b/taglib.go
index 527884c847..326feae92a 100644
--- a/taglib.go
+++ b/taglib.go
@@ -1,4 +1,4 @@
-package main
+package lightning
 
 import (
 	"bufio"
diff --git a/taglib_test.go b/taglib_test.go
index fbddc81904..fbaff356da 100644
--- a/taglib_test.go
+++ b/taglib_test.go
@@ -1,4 +1,4 @@
-package main
+package lightning
 
 import (
 	"bufio"
diff --git a/throttle.go b/throttle.go
index a841100109..da338f62f5 100644
--- a/throttle.go
+++ b/throttle.go
@@ -1,4 +1,4 @@
-package main
+package lightning
 
 import (
 	"sync"
diff --git a/tilelib.go b/tilelib.go
index 8c88956b97..455a526215 100644
--- a/tilelib.go
+++ b/tilelib.go
@@ -1,4 +1,4 @@
-package main
+package lightning
 
 import (
 	"bufio"
diff --git a/tilelib_test.go b/tilelib_test.go
index 947d456ac8..40bdb6d396 100644
--- a/tilelib_test.go
+++ b/tilelib_test.go
@@ -1,4 +1,4 @@
-package main
+package lightning
 
 import (
 	"bytes"
diff --git a/vcf2fasta.go b/vcf2fasta.go
index eea2f4df30..2f840ee73f 100644
--- a/vcf2fasta.go
+++ b/vcf2fasta.go
@@ -1,4 +1,4 @@
-package main
+package lightning
 
 import (
 	"bufio"
-- 
2.30.2