feat(import): copy folder contents

project-stacker · Apr 3, 2023 · de3c13f · de3c13f
1 parent 479fca8
commit de3c13f
Showing 1 changed file with 14 additions and 2 deletions.
diff --git a/pkg/stacker/import.go b/pkg/stacker/import.go
@@ -92,6 +92,7 @@ func importFile(imp string, cacheDir string, hash string, idest string, mode *fs
 	}
 
 	if !e1.IsDir() {
+		log.Infof("not a dir %s", imp)
 		err := verifyImportFileHash(imp, hash)
 		if err != nil {
 			return "", err
@@ -124,7 +125,13 @@ func importFile(imp string, cacheDir string, hash string, idest string, mode *fs
 		return dest, nil
 	}
 
-	dest := path.Join(cacheDir, path.Base(imp))
+	var dest string
+	if idest != "" {
+		dest = cacheDir
+	} else {
+		dest = path.Join(cacheDir, path.Base(imp))
+	}
+
 	if err := os.MkdirAll(dest, 0755); err != nil {
 		return "", errors.Wrapf(err, "failed making cache dir")
 	}
@@ -156,7 +163,12 @@ func importFile(imp string, cacheDir string, hash string, idest string, mode *fs
 			fallthrough
 		case mtree.Extra:
 			srcpath := path.Join(imp, d.Path())
-			destpath := path.Join(cacheDir, path.Base(imp), d.Path())
+			var destpath string
+			if idest != "" {
+				destpath = path.Join(cacheDir, d.Path())
+			} else {
+				destpath = path.Join(cacheDir, path.Base(imp), d.Path())
+			}
 
 			if d.New().IsDir() {
 				fi, err := os.Lstat(destpath)