Merge pull request #18 from wharfr/image-cmd-env

Expose the project dir to the image-cmd script
wharfr · Oct 8, 2019 · dad3e98 · dad3e98
2 parents 63361b7 + 73e2b40
commit dad3e98
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/lib/config/crate.go b/lib/config/crate.go
@@ -105,6 +105,7 @@ func GetCrate(start, name string, ls LabelSource) (*Crate, error) {
 }
 
 func runImageCmd(command string, projectDir string) (string, error) {
+	command = strings.TrimSpace(command)
 	shell := []string{"sh"}
 	if strings.HasPrefix(command, "#!") {
 		hashBang := strings.Split(command, "\n")[0]
@@ -115,6 +116,9 @@ func runImageCmd(command string, projectDir string) (string, error) {
 	cmd.Stdin = strings.NewReader(command)
 	cmd.Stdout = buf
 	cmd.Stderr = os.Stderr
+	cmd.Env = append(os.Environ(),
+		"WHARFRAT_PROJECT_DIR=" + projectDir,
+	)
 	if err := cmd.Run(); err != nil {
 		return "", err
 	}