Merge pull request #45 from bacalhau-project/fix/dup-lilypad-display

cli: version display fixes

Makefile

@@ -2,5 +2,14 @@ release:
 	go build -v -ldflags="\
 		-X 'github.com/bacalhau-project/lilypad/cmd/lilypad.VERSION=$$(git describe --tags --abbrev=0)' \
 		-X 'github.com/bacalhau-project/lilypad/cmd/lilypad.COMMIT_SHA=$$(git rev-parse HEAD)' \
-	" .
-	./lilypad version
+	" -o bin/
+	./bin/lilypad version
+
+
+
+.PHONY: release install
+
+install:
+	make release
+	cp ./bin/lilypad.exe $$GOBIN
+#Ps1: cmd	cp ./bin/lilypad.exe $env:GOBIN

cmd/lilypad/root.go

@@ -2,22 +2,24 @@ package lilypad
 
 import (
 	"context"
+	"fmt"
 	"os"
 
 	"github.com/spf13/cobra"
 )
 
 var Fatal = FatalErrorHandler
 
-func init() { //nolint:gochecknoinits
-	NewRootCmd()
-}
+//FIXME: why @Kai?
+//func init() { //nolint:gochecknoinits
+//	NewRootCmd()
+//}
 
 func NewRootCmd() *cobra.Command {
 	RootCmd := &cobra.Command{
 		Use:   getCommandLineExecutable(),
 		Short: "Lilypad",
-		Long:  `Lilypad`,
+		Long:  fmt.Sprintf("Lilypad: %s \nCommit: %s \n", VERSION, COMMIT_SHA),
 	}
 	RootCmd.AddCommand(newSolverCmd())
 	RootCmd.AddCommand(newResourceProviderCmd())

cmd/lilypad/run.go

@@ -4,6 +4,7 @@ import (
 	"fmt"
 	"os"
 	"os/signal"
+	"strings"
 	"syscall"
 	"time"
 
@@ -41,7 +42,7 @@ func newRunCmd() *cobra.Command {
 
 func runJob(cmd *cobra.Command, options jobcreator.JobCreatorOptions) error {
 	c := color.New(color.FgCyan).Add(color.Bold)
-	c.Print(`
+	header := `
 ⠀⠀⠀⠀⠀⠀⣀⣤⣤⢠⣤⣀⠀⠀⠀⠀⠀
 ⠀⠀⠀⠀⢴⣿⣿⣿⣿⢸⣿⡟⠀⠀⠀⠀⠀    ██╗     ██╗██╗  ██╗   ██╗██████╗  █████╗ ██████╗ 
 ⠀⠀⣰⣿⣦⡙⢿⣿⣿⢸⡿⠀⠀⠀⠀⢀⠀    ██║     ██║██║  ╚██╗ ██╔╝██╔══██╗██╔══██╗██╔══██╗
@@ -52,7 +53,12 @@ func runJob(cmd *cobra.Command, options jobcreator.JobCreatorOptions) error {
 ⠀⠀⠀⠉⢾⣿⣿⣿⣿⢸⣿⣿⣿⡷⠈⠀⠀                                                  
 ⠀⠀⠀⠀⠀⠈⠙⠛⠛⠘⠛⠋⠁⠀ ⠀⠀⠀   Decentralized Compute Network  https://lilypad.tech
 
-`)
+`
+	if VERSION != "" {
+		header = strings.Replace(header, "v2", VERSION, 1)
+	}
+	c.Print(header)
+
 	spinner, err := createSpinner("Lilypad submitting job", "🌟")
 	if err != nil {
 		fmt.Printf("failed to make spinner from config struct: %v\n", err)

cmd/lilypad/version.go

@@ -50,3 +50,9 @@ func runVersion(cmd *cobra.Command) error {
 
 	return nil
 }
+
+//func init() {
+//	if VERSION == "" {
+//		VERSION = "v2" //TODO: @release, FIX: L41
+//	}
+//}

main.go

@@ -1,8 +1,6 @@
 package main
 
 import (
-	"fmt"
-
 	"github.com/bacalhau-project/lilypad/cmd/lilypad"
 )
 
@@ -11,5 +9,5 @@ func main() {
 }
 
 func init() {
-	fmt.Printf("Lilypad: %s\n", lilypad.VERSION)
+	//fmt.Printf("Lilypad: %s\n", lilypad.VERSION)
 }