look at Changes.txt

Author: nProgrammer

CHANGELOGS/Changes.txt

@@ -32,4 +32,8 @@ CHANGES: 21-06-19-03-2021
 
 CHANGES: 21-06-23-03-2021
 - Added -version flag
-- Code cleaned up
+- Code cleaned up
+
+CHANGES: 21-06-24-03-2021
+- Added version.txt to godemon path
+- code cleaned up

cliTools/loadFlags.go

@@ -7,33 +7,33 @@ import (
 	"godemon/godemonInfo"
 )
 
-func LoadCMD(filepath string, modOrFile string, version string) (string, string, string, string, *bool, bool, string, string, string, string, bool, bool, bool, string, string, bool, bool, bool) {
+func LoadCMD(filepath string, modOrFile string) (string, string, string, string, *bool, bool, string, string, string, string, bool, bool, bool, string, string, bool, bool, bool) {
 	var filepathP *string
-	cmd := flag.Bool("cmd", false, "a bool")
-	cnfM := flag.Bool("cnf", false, "a bool")
-	deploy := flag.Bool("deploy", false, "a bool")
-	filepathP = flag.String("path", "", "a string")
-	commandP := flag.String("command", "", "a string")
-	helpP := flag.Bool("help", false, "a bool")
-	initP := flag.Bool("init", false, "a bool")
-	nameP := flag.String("name", "", "a string")
-	osP := flag.String("os", "", "a string")
-	archP := flag.String("arch", "", "a string")
-	mod := flag.Bool("mod", false, "a bool")
-	file := flag.Bool("file", false, "a bool")
-	addFileM := flag.Bool("addFile", false, "a bool")
-	addCommandM := flag.Bool("addCommand", false, "a bool")
-	addVariable := flag.Bool("addVariable", false, "a bool")
-	value := flag.String("value", "", "a string")
-	key := flag.String("key", "", "a string")
-	updateName := flag.Bool("updateName", false, "a bool")
-	updateArch := flag.Bool("updateArch", false, "a bool")
-	updateOS := flag.Bool("updateOS", false, "a bool")
-	versionF := flag.Bool("version", false, "a bool")
-	changes := flag.Bool("logChanges", false, "a bool")
+	cmd := flag.Bool("cmd", false, "CMD mode")
+	cnfM := flag.Bool("cnf", false, "project.json mode")
+	deploy := flag.Bool("deploy", false, "building project using info from project.json")
+	filepathP = flag.String("path", "", "path to file or dir")
+	commandP := flag.String("command", "", "command name")
+	helpP := flag.Bool("help", false, "help section")
+	initP := flag.Bool("init", false, "initialize project")
+	nameP := flag.String("name", "", "name of project/file/command")
+	osP := flag.String("os", "", "os variable")
+	archP := flag.String("arch", "", "architecture variable")
+	mod := flag.Bool("mod", false, "module option")
+	file := flag.Bool("file", false, "file option")
+	addFileM := flag.Bool("addFile", false, "add file to watching list in project.json")
+	addCommandM := flag.Bool("addCommand", false, "add command to commands list in project.json")
+	addVariable := flag.Bool("addVariable", false, "add tmp variable to project.json")
+	value := flag.String("value", "", "value of ...")
+	key := flag.String("key", "", "key of ...")
+	updateName := flag.Bool("updateName", false, "update name of project")
+	updateArch := flag.Bool("updateArch", false, "update arch of project")
+	updateOS := flag.Bool("updateOS", false, "update os of project")
+	versionF := flag.Bool("version", false, "print version of godemon")
+	changes := flag.Bool("logChanges", false, "print changes")
 	flag.Parse()
 	if *versionF == true {
-		godemonInfo.LogVersion(version)
+		godemonInfo.LogVersion()
 	}
 	if *changes == true {
 		godemonInfo.LogChanges()

controllers/functions.go

@@ -6,7 +6,7 @@ import (
 	"os"
 )
 
-func ProgramStarting(cnf *string, filepath string, modOrFile string, command string, help *bool, version string, init bool, name string, oso string, arch string, hOS string, addFile bool) (string, string) {
+func ProgramStarting(cnf *string, filepath string, modOrFile string, command string, help *bool, init bool, name string, oso string, arch string, hOS string, addFile bool) (string, string) {
 	if *cnf == "cmd" {
 
 	} else if *cnf == "cnf" {
@@ -25,7 +25,7 @@ func ProgramStarting(cnf *string, filepath string, modOrFile string, command str
 		(*cnf == "" && filepath == "" && modOrFile == "" &&
 			command == "" && *help == false && init == false &&
 			name == "" && oso == "" && arch == "") {
-		models.HelpCLI(version)
+		models.HelpCLI()
 	}
 	return filepath, modOrFile
 }

godemonInfo/version.go

@@ -3,10 +3,20 @@ package godemonInfo
 import (
 	"github.com/fatih/color"
 	"go/build"
+	"io/ioutil"
 	"os"
+	"strings"
 )
 
-func LogVersion(version string) {
+func LoadVersion() string {
+	godemonPath := os.Getenv("GODEMON")
+	path := godemonPath + "/.infos/version.txt"
+	v, _ := ioutil.ReadFile(path)
+	return strings.TrimSpace(string(v))
+}
+
+func LogVersion() {
+	version := LoadVersion()
 	fullVersion := "GODEMON-" + version + "-" + build.Default.GOOS + "_" + build.Default.GOARCH
 	color.Yellow(fullVersion)
 	os.Exit(1)

main.go

@@ -4,6 +4,7 @@
 //TODO - flags in commands
 //TODO - update installer - add changelogs directory
 //TODO - update updater - add changelogs updating
+//TODO - creating version.txt in .godemon/.infos
 
 //TODO - WebPage
 
@@ -18,6 +19,7 @@ import (
 	"godemon/controllers"
 	"godemon/errors"
 	"godemon/execs"
+	"godemon/godemonInfo"
 	"godemon/hotReload"
 	"godemon/updateInfo"
 	"os"
@@ -26,16 +28,16 @@ import (
 
 func main() {
 	hostInfo := [2]string{build.Default.GOOS, build.Default.GOARCH}
-	color.Cyan("Godemon starting...")
-	version := "21.06"
-	color.HiMagenta("Welcome to godemon " + version)
 	doneChan := make(chan bool)
-	filepath, modOrFile, cnf, command, help, init, name, oso, arch, cont, addFile, addCmd, addVar, key, value, updateName, updateArch, updateOS := cliTools.LoadCMD("", "", version)
+	version := godemonInfo.LoadVersion()
+	filepath, modOrFile, cnf, command, help, init, name, oso, arch, cont, addFile, addCmd, addVar, key, value, updateName, updateArch, updateOS := cliTools.LoadCMD("", "")
 	if cont == "Exit" {
 		os.Exit(1)
 	}
 	updateInfo.Update(updateName, name, updateArch, arch, oso, updateOS, addVar, key, value, addCmd, modOrFile, filepath)
-	filepath, modOrFile = controllers.ProgramStarting(&cnf, filepath, modOrFile, command, help, version, init, name, oso, arch, hostInfo[0], addFile)
+	filepath, modOrFile = controllers.ProgramStarting(&cnf, filepath, modOrFile, command, help, init, name, oso, arch, hostInfo[0], addFile)
+	color.Cyan("Godemon starting...")
+	color.HiMagenta("Welcome to godemon " + version)
 	for true {
 		go func(doneChan chan bool) {
 			defer func() {

models/staticCLI.go

@@ -3,10 +3,12 @@ package models
 import (
 	"fmt"
 	"github.com/fatih/color"
+	"godemon/godemonInfo"
 	"os"
 )
 
-func HelpCLI(version string) {
+func HelpCLI() {
+	version := godemonInfo.LoadVersion()
 	color.Green("Godemon %v:", version)
 	fmt.Printf("\nWhat flags do we have in Godemon? \n	1. Methods of godemon's runtime:" +
 		"\n		a) -cnf - using project.json file to load godemon project specifications,\n		b) -cmd - manualy passing godemon project specification using the CLI,\n		c) -deploy - deploying the project using specifications from project.json or CLI\n" +