Add propagating verbose to external subcommands(CanastaWiki#61)

chl178 · Mar 15, 2023 · 4076120 · 4076120
1 parent 57e3620
commit 4076120
Show file tree

Hide file tree

Showing 6 changed files with 44 additions and 0 deletions.
diff --git a/.idea/.gitignore b/.idea/.gitignore
diff --git a/.idea/Canasta-CLI.iml b/.idea/Canasta-CLI.iml
diff --git a/.idea/modules.xml b/.idea/modules.xml
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
diff --git a/internal/execute/execute.go b/internal/execute/execute.go
@@ -12,6 +12,14 @@ import (
 func Run(path, command string, cmdArgs ...string) (error, string) {
 	var stdout bytes.Buffer
 	var stderr bytes.Buffer
+
+	isVerbose := logging.GetVerbose()
+	if isVerbose {
+		if command == "docker-compose" {
+			cmdArgs = append([]string{"--verbose"}, cmdArgs...)
+		}
+	}
+
 	logging.Print(fmt.Sprint(command, " ", strings.Join(cmdArgs, " ")))
 	cmd := exec.Command("bash", "-c", command+" "+strings.Join(cmdArgs, " "))
 	cmd.Stdout = &stdout

diff --git a/internal/logging/logging.go b/internal/logging/logging.go
@@ -12,6 +12,10 @@ func SetVerbose(v bool) {
 	verbose = v
 }
 
+func GetVerbose() bool {
+	return verbose
+}
+
 func Print(output string) {
 	log.SetFlags(0)
 	if verbose {