X-Git-Url: https://git.arvados.org/lightning.git/blobdiff_plain/5fe4a5feeff081241b3da124336ed9ec086ba902..74ae10fa596b295fdd0904cf0568a3b3d7c5e0a9:/cmd.go

diff --git a/cmd.go b/cmd.go
index 17578b43e7..eeeb6fb740 100644
--- a/cmd.go
+++ b/cmd.go
@@ -1,4 +1,8 @@
-package main
+// Copyright (C) The Lightning Authors. All rights reserved.
+//
+// SPDX-License-Identifier: AGPL-3.0
+
+package lightning
 
 import (
 	"fmt"
@@ -6,8 +10,11 @@ import (
 	"io/ioutil"
 	"os"
 	"os/exec"
+	"strings"
 
 	"git.arvados.org/arvados.git/lib/cmd"
+	"github.com/mattn/go-isatty"
+	"github.com/sirupsen/logrus"
 )
 
 var (
@@ -19,15 +26,33 @@ var (
 		"ref2genome":         &ref2genome{},
 		"vcf2fasta":          &vcf2fasta{},
 		"import":             &importer{},
+		"annotate":           &annotatecmd{},
+		"export":             &exporter{},
 		"export-numpy":       &exportNumpy{},
-		"filter":             &filterer{},
+		"flake":              &flakecmd{},
+		"slice":              &slicecmd{},
+		"slice-numpy":        &sliceNumpy{},
+		"anno2vcf":           &anno2vcf{},
+		"numpy-comvar":       &numpyComVar{},
+		"filter":             &filtercmd{},
 		"build-docker-image": &buildDockerImage{},
-		"pca":                &pythonPCA{},
+		"pca-go":             &goPCA{},
+		"pca-py":             &pythonPCA{},
 		"plot":               &pythonPlot{},
+		"diff-fasta":         &diffFasta{},
+		"stats":              &statscmd{},
+		"merge":              &merger{},
+		"dumpgob":            &dumpGob{},
 	})
 )
 
-func main() {
+func Main() {
+	if !isatty.IsTerminal(os.Stderr.Fd()) {
+		logrus.StandardLogger().Formatter = &logrus.TextFormatter{DisableTimestamp: true}
+	}
+	if len(os.Args) >= 2 && !strings.HasSuffix(os.Args[1], "version") {
+		cmd.Version.RunCommand("lightning", nil, nil, os.Stderr, os.Stderr)
+	}
 	os.Exit(handler.RunCommand(os.Args[0], os.Args[1:], os.Stdin, os.Stdout, os.Stderr))
 }
 
@@ -40,11 +65,11 @@ func (cmd *buildDockerImage) RunCommand(prog string, args []string, stdin io.Rea
 		return 1
 	}
 	defer os.RemoveAll(tmpdir)
-	err = ioutil.WriteFile(tmpdir+"/Dockerfile", []byte(`FROM debian:10
+	err = ioutil.WriteFile(tmpdir+"/Dockerfile", []byte(`FROM debian:bullseye
 RUN DEBIAN_FRONTEND=noninteractive \
   apt-get update && \
   apt-get dist-upgrade -y && \
-  apt-get install -y --no-install-recommends bcftools bedtools samtools python3-sklearn python3-matplotlib && \
+  apt-get install -y --no-install-recommends bcftools bedtools samtools python2 python3-sklearn python3-matplotlib ca-certificates && \
   apt-get clean
 `), 0644)
 	if err != nil {