Merge pull request #100 from flownative/task/cleanup-path-building

Further clean up path building
flownative · Oct 10, 2024 · a19e097 · a19e097
2 parents d1ee022 + e0f493c
commit a19e097
Show file tree

Hide file tree

Showing 10 changed files with 27 additions and 21 deletions.
diff --git a/cmd/beach/cmd/helpers.go b/cmd/beach/cmd/helpers.go
@@ -173,7 +173,7 @@ func startLocalBeach() error {
 		_ = destination.Close()
 
 		log.Info("Starting reverse proxy and database server ...")
-		commandArgs := []string{"compose", "-f", path.Base + "docker-compose.yml", "up", "--remove-orphans", "-d"}
+		commandArgs := []string{"compose", "-f", filepath.Join(path.Base, "docker-compose.yml"), "up", "--remove-orphans", "-d"}
 		err = exec.RunInteractiveCommand("docker", commandArgs)
 		if err != nil {
 			return errors.New("container startup failed")

diff --git a/cmd/beach/cmd/init.go b/cmd/beach/cmd/init.go
@@ -17,7 +17,6 @@ package cmd
 import (
 	"os"
 	"path"
-	"path/filepath"
 	"regexp"
 	"strings"
 
@@ -80,11 +79,13 @@ func handleInitRun(cmd *cobra.Command, args []string) {
 	}
 	log.Info("Created 'Configuration/Development/Beach/Settings.yaml'.")
 
+	flowRootPath = strings.Trim(flowRootPath, "/")
+
 	environmentContent := readFileFromAssets("project/.localbeach.dist.env")
 	environmentContent = strings.ReplaceAll(environmentContent, "${BEACH_PROJECT_NAME}", projectName)
 	environmentContent = strings.ReplaceAll(environmentContent, "${BEACH_PROJECT_NAME_LOWERCASE}", strings.ToLower(projectName))
 	environmentContent = strings.ReplaceAll(environmentContent, "${BEACH_FLOW_ROOTPATH}", flowRootPath)
-	environmentContent = strings.ReplaceAll(environmentContent, "${BEACH_APPLICATION_PATH}", filepath.Join("/application", flowRootPath))
+	environmentContent = strings.ReplaceAll(environmentContent, "${BEACH_APPLICATION_PATH}", "/application/"+flowRootPath)
 
 	destination, err := os.Create(".localbeach.dist.env")
 	if err != nil {

diff --git a/cmd/beach/cmd/logs.go b/cmd/beach/cmd/logs.go
@@ -15,7 +15,6 @@
 package cmd
 
 import (
-	"path/filepath"
 	"strconv"
 
 	"github.com/flownative/localbeach/pkg/beachsandbox"
@@ -55,9 +54,9 @@ Docker containers (--containers).`,
 		} else {
 			commandArgs := []string{"exec", "-ti", sandbox.ProjectName + "_php", "bash", "-c"}
 			if follow {
-				commandArgs = append(commandArgs, "tail -n -"+strconv.Itoa(tail)+" -f "+filepath.Join("/application", sandbox.FlowRootPath, "Data/Logs/*.log"))
+				commandArgs = append(commandArgs, "tail -n -"+strconv.Itoa(tail)+" -f "+"/application/"+sandbox.FlowRootPath+"/Data/Logs/*.log")
 			} else {
-				commandArgs = append(commandArgs, "tail -n -"+strconv.Itoa(tail)+" "+filepath.Join("/application", sandbox.FlowRootPath, "Data/Logs/*.log"))
+				commandArgs = append(commandArgs, "tail -n -"+strconv.Itoa(tail)+" "+"/application/"+sandbox.FlowRootPath+"/Data/Logs/*.log")
 			}
 
 			err = exec.RunInteractiveCommand("docker", commandArgs)

diff --git a/cmd/beach/cmd/pause.go b/cmd/beach/cmd/pause.go
@@ -19,6 +19,7 @@ import (
 	"github.com/flownative/localbeach/pkg/path"
 	log "github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
+	"path/filepath"
 )
 
 // pauseCmd represents the pause command
@@ -36,7 +37,7 @@ func init() {
 
 func handlePauseRun(cmd *cobra.Command, args []string) {
 	log.Info("Pausing reverse proxy and database server ...")
-	commandArgs := []string{"compose", "-f", path.Base + "docker-compose.yml", "stop", "webserver", "database"}
+	commandArgs := []string{"compose", "-f", filepath.Join(path.Base, "docker-compose.yml"), "stop", "webserver", "database"}
 	output, err := exec.RunCommand("docker", commandArgs)
 	if err != nil {
 		log.Fatal(output)

diff --git a/cmd/beach/cmd/resume.go b/cmd/beach/cmd/resume.go
@@ -19,6 +19,7 @@ import (
 	"github.com/flownative/localbeach/pkg/path"
 	log "github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
+	"path/filepath"
 )
 
 // resumeCmd represents the resume command
@@ -36,7 +37,7 @@ func init() {
 
 func handleResumeRun(cmd *cobra.Command, args []string) {
 	log.Info("Starting reverse proxy and database server ...")
-	commandArgs := []string{"compose", "-f", path.Base + "docker-compose.yml", "start", "webserver", "database"}
+	commandArgs := []string{"compose", "-f", filepath.Join(path.Base, "docker-compose.yml"), "start", "webserver", "database"}
 	output, err := exec.RunCommand("docker", commandArgs)
 	if err != nil {
 		log.Fatal(output)

diff --git a/cmd/beach/cmd/setup-https.go b/cmd/beach/cmd/setup-https.go
@@ -16,6 +16,7 @@ package cmd
 
 import (
 	"errors"
+	"path/filepath"
 
 	"github.com/flownative/localbeach/pkg/exec"
 	"github.com/flownative/localbeach/pkg/path"
@@ -51,7 +52,7 @@ func handleSetupHttpsRun(cmd *cobra.Command, args []string) {
 		return
 	}
 
-	commandArgs = []string{"-cert-file", path.Certificates + "default.crt", "-key-file", path.Certificates + "default.key"}
+	commandArgs = []string{"-cert-file", filepath.Join(path.Certificates, "default.crt"), "-key-file", filepath.Join(path.Certificates, "default.key")}
 	for _, hostname := range strings.Split(host, ",") {
 		commandArgs = append(commandArgs, strings.Trim(hostname, " "))
 	}
@@ -68,7 +69,7 @@ func handleSetupHttpsRun(cmd *cobra.Command, args []string) {
 
 	if len(nginxStatusOutput) != 0 {
 		log.Info("Restarting reverse proxy ...")
-		commandArgs = []string{"compose", "-f", path.Base + "docker-compose.yml", "restart"}
+		commandArgs = []string{"compose", "-f", filepath.Join(path.Base, "docker-compose.yml"), "restart"}
 		output, err := exec.RunCommand("docker", commandArgs)
 		if err != nil {
 			log.Fatal(output)

diff --git a/cmd/beach/cmd/setup.go b/cmd/beach/cmd/setup.go
@@ -48,7 +48,7 @@ func migrateOldBase() error {
 		log.Info("migrating old data from " + path.OldBase + " to " + path.Base)
 
 		log.Info("stopping reverse proxy and database server")
-		commandArgs := []string{"compose", "-f", path.OldBase + "docker-compose.yml", "rm", "--force", "--stop", "-v"}
+		commandArgs := []string{"compose", "-f", filepath.Join(path.OldBase, "docker-compose.yml"), "rm", "--force", "--stop", "-v"}
 		output, err := exec.RunCommand("docker", commandArgs)
 		if err != nil {
 			log.Error(output)

diff --git a/pkg/beachsandbox/beachsandbox.go b/pkg/beachsandbox/beachsandbox.go
@@ -17,6 +17,7 @@ package beachsandbox
 import (
 	"os"
 	"path/filepath"
+	"strings"
 )
 
 type BeachSandbox struct {
@@ -36,8 +37,8 @@ func (sandbox *BeachSandbox) Init(rootPath string) error {
 
 	sandbox.DockerComposeFilePath = filepath.Join(sandbox.ProjectRootPath, ".localbeach.docker-compose.yaml")
 	sandbox.ProjectName = os.Getenv("BEACH_PROJECT_NAME")
-	sandbox.FlowRootPath = os.Getenv("BEACH_FLOW_ROOTPATH")
-	sandbox.ProjectDataPersistentResourcesPath = filepath.Join(rootPath, sandbox.FlowRootPath, "/Data/Persistent/Resources")
+	sandbox.FlowRootPath = strings.Trim(os.Getenv("BEACH_FLOW_ROOTPATH"), "/")
+	sandbox.ProjectDataPersistentResourcesPath = filepath.Join(sandbox.ProjectRootPath, sandbox.FlowRootPath, "Data/Persistent/Resources")
 
 	if info, err := os.Stat(filepath.Join(sandbox.ProjectRootPath, sandbox.FlowRootPath, "flow")); err == nil && !info.IsDir() {
 		return nil

diff --git a/pkg/path/path_darwin.go b/pkg/path/path_darwin.go
@@ -21,6 +21,7 @@ package path
 import (
 	"log"
 	"os"
+	"path/filepath"
 )
 
 var OldBase = ""
@@ -36,8 +37,8 @@ func init() {
 		return
 	}
 
-	OldBase = homeDir + "/Library/Application Support/Flownative/Local Beach/"
-	Base = homeDir + "/.LocalBeach/"
-	Certificates = Base + "Certificates/"
-	Database = Base + "MariaDB"
+	OldBase = filepath.Join(homeDir, "Library", "Application Support", "Flownative", "Local Beach")
+	Base = filepath.Join(homeDir, ".LocalBeach")
+	Certificates = filepath.Join(Base, "Certificates")
+	Database = filepath.Join(Base, "MariaDB")
 }
diff --git a/pkg/path/path_linux.go b/pkg/path/path_linux.go
@@ -21,6 +21,7 @@ package path
 import (
 	"log"
 	"os"
+	"path/filepath"
 )
 
 var OldBase = ""
@@ -36,8 +37,8 @@ func init() {
 		return
 	}
 
-	OldBase = homeDir + "/.Flownative/Local Beach/"
-	Base = homeDir + "/.LocalBeach/"
-	Certificates = Base + "Certificates/"
-	Database = Base + "MariaDB/"
+	OldBase = filepath.Join(homeDir, ".Flownative", "Local Beach")
+	Base = filepath.Join(homeDir, ".LocalBeach")
+	Certificates = filepath.Join(Base, "Certificates")
+	Database = filepath.Join(Base, "MariaDB")
 }