code updated, shell-script updated

Author: nProgrammer

cliTools/loadFlags.go

@@ -4,28 +4,26 @@ import (
 	"flag"
 )
 
-func LoadCMD(filepath string, modOrFile string) (string, string, string, string, *bool, bool, string, string, string, bool) {
+func LoadCMD(filepath string, modOrFile string) (string, string, string, string, *bool, bool, string, string, string) {
 	var filepathP *string
 	var modOrFileP *string
 	cnfP := flag.String("cnf", "", "a string")
 	filepathP = flag.String("path", "", "a string")
 	commandP := flag.String("command", "", "a string")
 	helpP := flag.Bool("help", false, "a bool")
-	logsP := flag.Bool("logs", 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")
 	modOrFileP = flag.String("modOrFile", "", "a string")
 	flag.Parse()
 	cnf := *cnfP
-	logs := *logsP
 	filepath = *filepathP
 	init := *initP
 	name := *nameP
 	os := *osP
 	arch := *archP
 	command := *commandP
 	modOrFile = *modOrFileP
-	return filepath, modOrFile, cnf, command, helpP, init, name, os, arch, logs
+	return filepath, modOrFile, cnf, command, helpP, init, name, os, arch
 }

controllers/watch.go

@@ -6,11 +6,11 @@ import (
 	"time"
 )
 
-func WatchFiles(fileordirPath string, hOS string, name string) error {
-	return watch(fileordirPath, hOS, name)
+func WatchFiles(fileordirPath string, hOS string) error {
+	return watch(fileordirPath, hOS)
 }
 
-func watch(fileordirPath string, hOS string, name string) error {
+func watch(fileordirPath string, hOS string) error {
 	initialStat, err := os.Stat(fileordirPath)
 	if err != nil {
 		return err
@@ -21,7 +21,7 @@ func watch(fileordirPath string, hOS string, name string) error {
 			return err
 		}
 		if stat.Size() != initialStat.Size() || stat.ModTime() != initialStat.ModTime() {
-			killProcess.KillProcess(hOS, name)
+			killProcess.KillProcess(hOS)
 			break
 		}
 		time.Sleep(1 * time.Second)

execs/executables.go

@@ -8,7 +8,7 @@ import (
 	"os"
 )
 
-func ExecMOD(hOS string, name string, logs bool) {
+func ExecMOD(hOS string) {
 	jsonFile, err := os.Open("project.json")
 	errors.ErrorHandle(err)
 	defer jsonFile.Close()
@@ -21,7 +21,7 @@ func ExecMOD(hOS string, name string, logs bool) {
 		err = os.Setenv(pr.Vars[i].Key, pr.Vars[i].Value)
 		errors.TMPerrorHandle(err)
 	}
-	execMOD(hOS, name, logs)
+	execMOD(hOS)
 }
 
 func ExecFile(filepath string) {

execs/executablesPv.go

@@ -2,27 +2,20 @@ package execs
 
 import (
 	"godemon/errors"
+	"godemon/prepareProject"
 	"os"
 	"os/exec"
 )
 
-func execMOD(hOS string, name string, logs bool) {
+func execMOD(hOS string) {
+	name := prepareProject.LoadProjectInfo().Name
 	if hOS == "windows" {
 		cmd := exec.Command("app-godemon-app-godemon-tmp-generated" + "-" + name + ".exe")
 		cmd.Stdout = os.Stdout
 		cmd.Stderr = os.Stderr
 		err := cmd.Run()
 		errors.ErrorHandle(err)
 	} else {
-		if logs == true {
-			logFile := name + "_logs.txt"
-			cmd := exec.Command("./app-godemon-app-godemon-tmp-generated" + "-" + name + "2>&1" + "|" + "tee" + logFile)
-			cmd.Stdout = os.Stdout
-			cmd.Stderr = os.Stderr
-			err := cmd.Run()
-			errors.ErrorHandle(err)
-			return
-		}
 		cmd := exec.Command("./app-godemon-app-godemon-tmp-generated" + "-" + name)
 		cmd.Stdout = os.Stdout
 		cmd.Stderr = os.Stderr

godemon-installer.sh

@@ -9,7 +9,7 @@ printf "\nDo you want to do this: \n1. Global \n2. Local \n"
 printf "\nAnswer: "
 read GL
 
-wget https://github.com/nProgrammer/godemon/releases/download/2.6.4/godemon
+wget https://github.com/nProgrammer/godemon/releases/download/2.7.0/godemon
 
 if [ "$OPTION" = "1" ]
 then

models/hotReload.go hotReload/hotReload.gomodels/hotReload.go renamed to hotReload/hotReload.go

@@ -1,8 +1,12 @@
-package models
+package hotReload
 
-import "os/exec"
+import (
+	"godemon/prepareProject"
+	"os/exec"
+)
 
-func CMDhotReload(hostInfo [2]string, name string) *exec.Cmd {
+func CMDhotReload(hostInfo [2]string) *exec.Cmd {
+	name := prepareProject.LoadProjectInfo().Name
 	if hostInfo[0] != "windows" {
 		cmd := exec.Command("go", "build", "-o", "app-godemon-app-godemon-tmp-generated"+"-"+name)
 		return cmd

killProcess/kill.go

@@ -2,11 +2,13 @@ package killProcess
 
 import (
 	"godemon/errors"
+	"godemon/prepareProject"
 	"os"
 	"os/exec"
 )
 
-func killCMDgen(hOS string, name string) *exec.Cmd {
+func killCMDgen(hOS string) *exec.Cmd {
+	name := prepareProject.LoadProjectInfo().Name
 	var cmd *exec.Cmd
 	if hOS == "windows" {
 		cmd = exec.Command("taskkill", "/IM", "app-godemon-app-godemon-tmp-generated"+"-"+name+".exe", "/F")
@@ -16,8 +18,8 @@ func killCMDgen(hOS string, name string) *exec.Cmd {
 	return cmd
 }
 
-func KillProcess(hOS string, name string) {
-	cmd := killCMDgen(hOS, name)
+func KillProcess(hOS string) {
+	cmd := killCMDgen(hOS)
 	cmd.Stdout = os.Stdout
 	cmd.Stderr = os.Stderr
 	err := cmd.Run()

main.go

@@ -8,37 +8,37 @@ import (
 	"godemon/controllers"
 	"godemon/errors"
 	"godemon/execs"
-	"godemon/models"
+	"godemon/hotReload"
 	"os"
 	"os/exec"
 )
 
 func main() {
 	hostInfo := [2]string{build.Default.GOOS, build.Default.GOARCH}
 	color.Cyan("Godemon starting...")
-	version := "2.6.4"
+	version := "2.7.0"
 	doneChan := make(chan bool)
-	filepath, modOrFile, cnf, command, help, init, name, oso, arch, logs := cliTools.LoadCMD("", "")
+	filepath, modOrFile, cnf, command, help, init, name, oso, arch := cliTools.LoadCMD("", "")
 	filepath, modOrFile = controllers.ProgramStarting(&cnf, filepath, modOrFile, command, help, version, init, name, oso, arch, hostInfo[0])
 	for true {
 		go func(doneChan chan bool) {
 			defer func() {
 				doneChan <- true
 			}()
-			err := controllers.WatchFiles(filepath, hostInfo[0], name)
+			err := controllers.WatchFiles(filepath, hostInfo[0])
 			errors.ErrorHandle(err)
 			fmt.Println("File has been changed")
 			if modOrFile == "mod" {
 				err = os.Chdir(filepath)
 				errors.ErrorHandle(err)
 				cliTools.TimeLog()
 				var cmd *exec.Cmd
-				cmd = models.CMDhotReload(hostInfo, name)
+				cmd = hotReload.CMDhotReload(hostInfo)
 				cmd.Stdout = os.Stdout
 				cmd.Stderr = os.Stderr
 				err = cmd.Run()
 				errors.ErrorHandle(err)
-				go execs.ExecMOD(hostInfo[0], name, logs)
+				go execs.ExecMOD(hostInfo[0])
 			} else if modOrFile == "file" {
 				cliTools.TimeLog()
 				go execs.ExecFile(filepath)