Allow absolute paths to be specified (#93)

CanastaWiki · Jul 27, 2023 · 797bdfa · 797bdfa
1 parent dcf8a9d
commit 797bdfa
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/internal/canasta/canasta.go b/internal/canasta/canasta.go
@@ -36,7 +36,7 @@ func CloneStackRepo(orchestrator, canastaId string, path *string) error {
 func CopyEnv(envPath, domainName, path, pwd string) error {
 	if envPath == "" {
 		envPath = path + "/.env.example"
-	} else {
+	} else if !strings.HasPrefix(envPath, "/") {
 		envPath = pwd + "/" + envPath
 	}
 	logging.Print(fmt.Sprintf("Copying %s to %s/.env\n", envPath, path))
@@ -56,7 +56,9 @@ func CopyEnv(envPath, domainName, path, pwd string) error {
 //Copies the LocalSettings.php at localSettingsPath to /config at the installation directory
 func CopyLocalSettings(localSettingsPath, path, pwd string) error {
 	if localSettingsPath != "" {
-		localSettingsPath = pwd + "/" + localSettingsPath
+		if !strings.HasPrefix(localSettingsPath, "/") {
+			localSettingsPath = pwd + "/" + localSettingsPath
+		}
 		logging.Print(fmt.Sprintf("Copying %s to %s/config/LocalSettings.php\n", localSettingsPath, path))
 		err, output := execute.Run("", "cp", localSettingsPath, path+"/config/LocalSettings.php")
 		if err != nil {

diff --git a/internal/orchestrators/orchestrators.go b/internal/orchestrators/orchestrators.go
@@ -3,6 +3,7 @@ package orchestrators
 import (
 	"fmt"
 	"os/exec"
+	"strings"
 
 	"github.com/CanastaWiki/Canasta-CLI-Go/internal/config"
 	"github.com/CanastaWiki/Canasta-CLI-Go/internal/execute"
@@ -42,7 +43,9 @@ func CopyOverrideFile(path, orchestrator, sourceFilename, pwd string) error {
 		logging.Print("Copying override file\n")
 		switch orchestrator {
 		case "docker-compose":
-			sourceFilename = pwd + "/" + sourceFilename
+			if !strings.HasPrefix(sourceFilename, "/") {
+				sourceFilename = pwd + "/" + sourceFilename
+			}
 			var overrideFilename = path + "/docker-compose.override.yml"
 			logging.Print(fmt.Sprintf("Copying %s to %s\n", sourceFilename, overrideFilename))
 			err, output := execute.Run("", "cp", sourceFilename, overrideFilename)