From 2e527a03d2b963b9f5470101aeed236847a326b1 Mon Sep 17 00:00:00 2001
From: Mohammed Diaa <md@mhmdiaa.com>
Date: Fri, 24 Mar 2023 21:54:28 +0200
Subject: [PATCH] Fix absolute output-dir handling

---
 cmd/output/output.go | 39 ++++++++++-----------------------------
 1 file changed, 10 insertions(+), 29 deletions(-)

diff --git a/cmd/output/output.go b/cmd/output/output.go
index 5020fae..a38bfab 100644
--- a/cmd/output/output.go
+++ b/cmd/output/output.go
@@ -229,21 +229,12 @@ func DownloadRunOutput(run *types.Run, nodes map[string]NodeInfo, version *types
 	runDir = strings.TrimSuffix(runDir, "Z")
 	runDir = strings.Replace(runDir, "T", "-", 1)
 	runDir = path.Join(destinationPath, runDir)
-	runDirPath := strings.Split(runDir, "/")
-	toMerge := ""
-	for _, dir := range runDirPath {
-		toMerge = path.Join(toMerge, dir)
-		dirInfo, err := os.Stat(toMerge)
-		dirExists := !os.IsNotExist(err) && dirInfo.IsDir()
 
-		if !dirExists {
-			err = os.Mkdir(toMerge, 0755)
-			if err != nil {
-				fmt.Println(err)
-				fmt.Println("Couldn't create a directory to store run output!")
-				os.Exit(0)
-			}
-		}
+	err := os.MkdirAll(runDir, 0755)
+	if err != nil {
+		fmt.Println(err)
+		fmt.Println("Couldn't create a directory to store run output!")
+		os.Exit(0)
 	}
 
 	if len(nodes) == 0 {
@@ -398,21 +389,11 @@ func getSubJobOutput(savePath string, subJob *types.SubJob, fetchData bool) []ty
 
 				if fileName != subJobOutputs.Results[i].Path {
 					subDirsPath := strings.TrimSuffix(subJobOutputs.Results[i].Path, fileName)
-					subDirs := strings.Split(strings.Trim(subDirsPath, "/"), "/")
-					toMerge := savePath
-					for _, subDir := range subDirs {
-						toMerge = path.Join(toMerge, subDir)
-						dirInfo, err := os.Stat(toMerge)
-						dirExists := !os.IsNotExist(err) && dirInfo.IsDir()
-
-						if !dirExists {
-							err = os.Mkdir(toMerge, 0755)
-							if err != nil {
-								fmt.Println(err)
-								fmt.Println("Couldn't create a directory to store run output!")
-								os.Exit(0)
-							}
-						}
+					err := os.MkdirAll(subDirsPath, 0755)
+					if err != nil {
+						fmt.Println(err)
+						fmt.Println("Couldn't create a directory to store run output!")
+						os.Exit(0)
 					}
 					fileName = subJobOutputs.Results[i].Path
 				}