app/scriptpack: output to scriptpack_staging

hashicorp · Dec 16, 2015 · df576d0 · df576d0
1 parent a95dad3
commit df576d0
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/.gitignore b/.gitignore
@@ -12,6 +12,7 @@ website/.bundle
 website/.vagrant
 website/build
 website/node_modules
+_scriptpack_staging/
 .bundle/
 .vagrant/
 *.backup

diff --git a/builtin/app/scriptpack/data/common/rebuild/rebuild.go.tpl b/builtin/app/scriptpack/data/common/rebuild/rebuild.go.tpl
@@ -15,7 +15,7 @@ func main() {
 	// doesn't, it will show up in the error output.
 	log.SetOutput(ioutil.Discard)
 
-	path := filepath.Join("{{ path.working }}", "_staging")
+	path := filepath.Join("{{ path.working }}", "_scriptpack_staging")
 	if err := os.RemoveAll(path); err !=nil {
 		fmt.Fprintf(os.Stderr, err.Error()+"\n")
 		os.Exit(1)