Respect TART_HOME (#50)

Fixes #38
cirruslabs · Feb 27, 2023 · 4c69620 · 4c69620
1 parent ab20fcc
commit 4c69620
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 12 deletions.
diff --git a/builder/tart/artifact.go b/builder/tart/artifact.go
@@ -47,6 +47,5 @@ func (a *TartVMArtifact) Destroy() error {
 }
 
 func (a *TartVMArtifact) vmDirPath() string {
-	home, _ := os.UserHomeDir()
-	return path.Join(home, ".tart", "vms", a.VMName)
+	return PathInTartHome("vms", a.VMName)
 }
diff --git a/builder/tart/helpers.go b/builder/tart/helpers.go
@@ -4,10 +4,20 @@ import (
 	"bytes"
 	"fmt"
 	"log"
+	"os"
 	"os/exec"
+	"path"
 	"strings"
 )
 
+func PathInTartHome(elem ...string) string {
+	if home := os.Getenv("TART_HOME"); home != "" {
+		return path.Join(home, path.Join(elem...))
+	}
+	userHome, _ := os.UserHomeDir()
+	return path.Join(userHome, ".tart", path.Join(elem...))
+}
+
 func TartExec(args ...string) (string, error) {
 	var out bytes.Buffer
 

diff --git a/builder/tart/step_disk_file_prepare.go b/builder/tart/step_disk_file_prepare.go
@@ -8,7 +8,6 @@ import (
 	"github.com/hashicorp/packer-plugin-sdk/multistep"
 	packersdk "github.com/hashicorp/packer-plugin-sdk/packer"
 	"os"
-	"path"
 )
 
 type stepDiskFilePrepare struct {
@@ -21,17 +20,10 @@ func (s *stepDiskFilePrepare) Run(ctx context.Context, state multistep.StateBag)
 
 	ui.Say("Inspecting machine disk image...")
 
-	homeDir, err := os.UserHomeDir()
-
-	if err != nil {
-		ui.Error(err.Error())
-		return multistep.ActionHalt
-	}
-
-	diskImagePath := path.Join(homeDir, ".tart", "vms", config.VMName, "disk.img")
+	diskImagePath := PathInTartHome("vms", config.VMName, "disk.img")
 
 	if config.DiskSizeGb > 0 {
-		err = growDisk(config.DiskSizeGb, diskImagePath)
+		err := growDisk(config.DiskSizeGb, diskImagePath)
 
 		if err != nil {
 			ui.Error(err.Error())