From 806a8e0154d5ca3cd7bbe09ac18f4b9510c02c33 Mon Sep 17 00:00:00 2001 From: Mitchell Hashimoto Date: Mon, 8 Sep 2014 14:17:27 -0700 Subject: [PATCH] Move checkpoint into its own file to make it easy --- checkpoint.go | 33 +++++++++++++++++++++++++++++++++ packer.go | 18 +----------------- 2 files changed, 34 insertions(+), 17 deletions(-) create mode 100644 checkpoint.go diff --git a/checkpoint.go b/checkpoint.go new file mode 100644 index 000000000..9ad587f23 --- /dev/null +++ b/checkpoint.go @@ -0,0 +1,33 @@ +package main + +import ( + "fmt" + "log" + "path/filepath" + + "github.com/hashicorp/go-checkpoint" + "github.com/mitchellh/packer/packer" +) + +func runCheckpoint(c *config) { + configDir, err := ConfigDir() + if err != nil { + log.Printf("[ERR] Checkpoint setup error: %s", err) + return + } + + version := packer.Version + if packer.VersionPrerelease != "" { + version += fmt.Sprintf(".%s", packer.VersionPrerelease) + } + + _, err = checkpoint.Check(&checkpoint.CheckParams{ + Product: "packer", + Version: version, + SignatureFile: filepath.Join(configDir, "checkpoint_signature"), + CacheFile: filepath.Join(configDir, "checkpoint_cache"), + }) + if err != nil { + log.Printf("[ERR] Checkpoint error: %s", err) + } +} diff --git a/packer.go b/packer.go index 5fac9fd4f..14b67db22 100644 --- a/packer.go +++ b/packer.go @@ -10,7 +10,6 @@ import ( "path/filepath" "runtime" - "github.com/hashicorp/go-checkpoint" "github.com/mitchellh/packer/packer" "github.com/mitchellh/packer/packer/plugin" "github.com/mitchellh/panicwrap" @@ -95,23 +94,8 @@ func wrappedMain() int { } log.Printf("Packer config: %+v", config) - configDir, err := ConfigDir() - if err != nil { - fmt.Fprintf(os.Stderr, "Error loading config dir: \n\n%s\n", err) - return 1 - } - // Fire off the checkpoint. - version := packer.Version - if packer.VersionPrerelease != "" { - version += fmt.Sprintf(".%s", packer.VersionPrerelease) - } - go checkpoint.Check(&checkpoint.CheckParams{ - Product: "packer", - Version: version, - SignatureFile: filepath.Join(configDir, "checkpoint_signature"), - CacheFile: filepath.Join(configDir, "checkpoint_cache"), - }) + go runCheckpoint(config) cacheDir := os.Getenv("PACKER_CACHE_DIR") if cacheDir == "" {