From 481813a813d8e1250d84140c95641e6c007fa5ab Mon Sep 17 00:00:00 2001
From: Yngvar Kristiansen <562343+yngvark@users.noreply.github.com>
Date: Wed, 17 Jul 2024 10:53:17 +0200
Subject: [PATCH 1/2] feat: Use version from ldlflags

---
 cmd/get.go     |  8 ++++----
 cmd/version.go | 16 +++++++++++++---
 main.go        | 13 +++++++++++++
 3 files changed, 30 insertions(+), 7 deletions(-)

diff --git a/cmd/get.go b/cmd/get.go
index 73bb69b..f63af7d 100644
--- a/cmd/get.go
+++ b/cmd/get.go
@@ -14,8 +14,8 @@ var getCommand = &cobra.Command{
 	Run: func(cmd *cobra.Command, args []string) {
 		baseURL := "git@github.com:oslokommune/golden-path-boilerplate.git//boilerplate"
 		ref := "main"
-		if version != "" {
-			ref = version
+		if okGetVersion != "" {
+			ref = okGetVersion
 		}
 		if outputFolder == "" {
 			outputFolder = templateName
@@ -46,12 +46,12 @@ var getCommand = &cobra.Command{
 
 var templateName string
 var outputFolder string
-var version string
+var okGetVersion string
 
 func init() {
 	getCommand.Flags().StringVarP(&templateName, "template", "t", "", "Template name (required)")
 	getCommand.MarkFlagRequired("template")
 	getCommand.Flags().StringVarP(&outputFolder, "output-folder", "o", "", "Output folder (optional)")
-	getCommand.Flags().StringVarP(&version, "version", "v", "", "Version (optional)")
+	getCommand.Flags().StringVarP(&okGetVersion, "version", "v", "", "Version (optional)")
 	rootCmd.AddCommand(getCommand)
 }
diff --git a/cmd/version.go b/cmd/version.go
index 9ede6b7..692608f 100644
--- a/cmd/version.go
+++ b/cmd/version.go
@@ -1,10 +1,13 @@
 package cmd
 
 import (
-	"github.com/oslokommune/ok/internal/scriptrunner"
+	_ "embed"
+	"fmt"
 	"github.com/spf13/cobra"
 )
 
+var VersionData Version
+
 func init() {
 	rootCmd.AddCommand(versionCmd)
 }
@@ -13,7 +16,14 @@ var versionCmd = &cobra.Command{
 	Use:   "version",
 	Short: "Prints the version of the ok tool and the current latest version available.",
 	Run: func(cmd *cobra.Command, args []string) {
-		fullArgs := append([]string{"version"}, args...)
-		scriptrunner.RunScript("ok.sh", fullArgs)
+		fmt.Printf("Version: %s\n", VersionData.Version)
+		fmt.Printf("Date:    %s\n", VersionData.Date)
+		fmt.Printf("Commit:  %s\n", VersionData.Commit)
 	},
 }
+
+type Version struct {
+	Version string
+	Date    string
+	Commit  string
+}
diff --git a/main.go b/main.go
index 0d7d543..ee8a007 100644
--- a/main.go
+++ b/main.go
@@ -7,8 +7,21 @@ import (
 	"os"
 )
 
+var (
+	version = "dev"
+	date    = "unknown"
+	commit  = "none"
+)
+
 func main() {
 	log.Logger = log.Output(zerolog.ConsoleWriter{Out: os.Stdout})
 
+	cmd.VersionData = cmd.Version{
+		Version: version,
+		Date:    date,
+		Commit:  commit,
+	}
+
 	cmd.Execute()
+
 }

From af8801f19792b30adaee754926f4ec591a87cb53 Mon Sep 17 00:00:00 2001
From: Yngvar Kristiansen <562343+yngvark@users.noreply.github.com>
Date: Wed, 17 Jul 2024 10:54:34 +0200
Subject: [PATCH 2/2] chore: Dont rename okGetVersion

---
 cmd/get.go | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/cmd/get.go b/cmd/get.go
index f63af7d..73bb69b 100644
--- a/cmd/get.go
+++ b/cmd/get.go
@@ -14,8 +14,8 @@ var getCommand = &cobra.Command{
 	Run: func(cmd *cobra.Command, args []string) {
 		baseURL := "git@github.com:oslokommune/golden-path-boilerplate.git//boilerplate"
 		ref := "main"
-		if okGetVersion != "" {
-			ref = okGetVersion
+		if version != "" {
+			ref = version
 		}
 		if outputFolder == "" {
 			outputFolder = templateName
@@ -46,12 +46,12 @@ var getCommand = &cobra.Command{
 
 var templateName string
 var outputFolder string
-var okGetVersion string
+var version string
 
 func init() {
 	getCommand.Flags().StringVarP(&templateName, "template", "t", "", "Template name (required)")
 	getCommand.MarkFlagRequired("template")
 	getCommand.Flags().StringVarP(&outputFolder, "output-folder", "o", "", "Output folder (optional)")
-	getCommand.Flags().StringVarP(&okGetVersion, "version", "v", "", "Version (optional)")
+	getCommand.Flags().StringVarP(&version, "version", "v", "", "Version (optional)")
 	rootCmd.AddCommand(getCommand)
 }