removing newlines, renaming cache argument to cache-dir

Author: vsoch

cmd/root.go

@@ -141,10 +141,8 @@ func getImage(imageName string) (pkgutil.Image, error) {
 }
 
 func getCacheDir(imageName string) (string, error) {
-
 	// First preference for cache is set at command line
 	if cacheDir == "" {
-
 		// second preference is environment
 		cacheDir = os.Getenv(containerDiffEnvCacheDir)
 	}
@@ -153,7 +151,7 @@ func getCacheDir(imageName string) (string, error) {
 	if cacheDir == "" {
 		dir, err := homedir.Dir()
 		if err != nil {
-			return "", err
+                        return "", errors.Wrap(err, "retrieving home dir")
 		} else {
 			cacheDir = dir
 		}
@@ -201,6 +199,6 @@ func addSharedFlags(cmd *cobra.Command) {
 	cmd.Flags().BoolVarP(&save, "save", "s", false, "Set this flag to save rather than remove the final image filesystems on exit.")
 	cmd.Flags().BoolVarP(&util.SortSize, "order", "o", false, "Set this flag to sort any file/package results by descending size. Otherwise, they will be sorted by name.")
 	cmd.Flags().BoolVarP(&noCache, "no-cache", "n", false, "Set this to force retrieval of image filesystem on each run.")
-	cmd.Flags().StringVarP(&cacheDir, "cache", "c", "", "cache directory base to create .container-diff (default is $HOME).")
+	cmd.Flags().StringVarP(&cacheDir, "cache-dir", "c", "", "cache directory base to create .container-diff (default is $HOME).")
 
 }