🌱 Shorten defaultConfig to conf

bindl-dev · Mar 25, 2022 · 1fe60eb · 1fe60eb
1 parent 70b5c28
commit 1fe60eb
Show file tree

Hide file tree

Showing 8 changed files with 18 additions and 18 deletions.
diff --git a/command/cli/cli.go b/command/cli/cli.go
@@ -36,15 +36,15 @@ var Root = &cobra.Command{
 	Use:  "bindl",
 	Long: "Bindl is a static binary downloader for project development and infrastructure.",
 	PersistentPreRunE: func(cmd *cobra.Command, args []string) error {
-		if err := envconfig.Process("BINDL", defaultConfig); err != nil {
+		if err := envconfig.Process("BINDL", conf); err != nil {
 			return err
 		}
 
 		var logLevel string
 		switch {
-		case defaultConfig.Silent:
+		case conf.Silent:
 			logLevel = "disabled"
-		case defaultConfig.Debug:
+		case conf.Debug:
 			logLevel = "debug"
 		default:
 			logLevel = "info"
@@ -53,7 +53,7 @@ var Root = &cobra.Command{
 	},
 }
 
-var defaultConfig = &config.Runtime{
+var conf = &config.Runtime{
 	Path:         "./bindl.yaml",
 	LockfilePath: "./.bindl-lock.yaml",
 	BinDir:       "./bin",
@@ -67,11 +67,11 @@ var defaultConfig = &config.Runtime{
 }
 
 func init() {
-	Root.PersistentFlags().StringVarP(&defaultConfig.Path, "config", "c", defaultConfig.Path, "path to configuration file")
-	Root.PersistentFlags().StringVarP(&defaultConfig.LockfilePath, "lock", "l", defaultConfig.LockfilePath, "path to lockfile")
-	Root.PersistentFlags().StringVarP(&defaultConfig.BinDir, "bin", "b", defaultConfig.BinDir, "directory in PATH to add binaries")
-	Root.PersistentFlags().StringVar(&defaultConfig.ProgDir, "prog", defaultConfig.ProgDir, "directory to save real binary content")
+	Root.PersistentFlags().StringVarP(&conf.Path, "config", "c", conf.Path, "path to configuration file")
+	Root.PersistentFlags().StringVarP(&conf.LockfilePath, "lock", "l", conf.LockfilePath, "path to lockfile")
+	Root.PersistentFlags().StringVarP(&conf.BinDir, "bin", "b", conf.BinDir, "directory in PATH to add binaries")
+	Root.PersistentFlags().StringVar(&conf.ProgDir, "prog", conf.ProgDir, "directory to save real binary content")
 
-	Root.PersistentFlags().BoolVarP(&defaultConfig.Silent, "silent", "s", defaultConfig.Silent, "silence logs")
-	Root.PersistentFlags().BoolVar(&defaultConfig.Debug, "debug", defaultConfig.Debug, "show debug logs")
+	Root.PersistentFlags().BoolVarP(&conf.Silent, "silent", "s", conf.Silent, "silence logs")
+	Root.PersistentFlags().BoolVar(&conf.Debug, "debug", conf.Debug, "show debug logs")
 }
diff --git a/command/cli/generate_ignore.go b/command/cli/generate_ignore.go
@@ -37,7 +37,7 @@ For example, with default output directory "bin":
 
 Supports typical ignore files. e.g. .dockerignore`,
 	RunE: func(cmd *cobra.Command, args []string) error {
-		return command.UpdateIgnoreFile(defaultConfig, bindlGenerateIgnorePath)
+		return command.UpdateIgnoreFile(conf, bindlGenerateIgnorePath)
 	},
 }
 

diff --git a/command/cli/generate_make.go b/command/cli/generate_make.go
@@ -42,7 +42,7 @@ in your other rules. For example:
 
 Calling the imported rules also works on 'make' CLI.`,
 	RunE: func(cmd *cobra.Command, args []string) error {
-		return command.GenerateMakefile(defaultConfig, bindlGenerateMakefilePath)
+		return command.GenerateMakefile(conf, bindlGenerateMakefilePath)
 	},
 }
 

diff --git a/command/cli/get.go b/command/cli/get.go
@@ -32,11 +32,11 @@ will be selected.`,
 	RunE: func(cmd *cobra.Command, names []string) error {
 		err := command.IterateLockfilePrograms(
 			cmd.Context(),
-			defaultConfig,
+			conf,
 			names,
 			command.Get)
 		if err == nil {
-			internal.Msgf("✨ Program(s) were downloaded, ensure that %s is in your $PATH to use properly.\n", defaultConfig.BinDir)
+			internal.Msgf("✨ Program(s) were downloaded, ensure that %s is in your $PATH to use properly.\n", conf.BinDir)
 		}
 		return err
 	},

diff --git a/command/cli/list.go b/command/cli/list.go
@@ -31,7 +31,7 @@ var BindlList = &cobra.Command{
 	Args: cobra.NoArgs,
 
 	RunE: func(cmd *cobra.Command, args []string) error {
-		l, err := config.ParseLock(defaultConfig.LockfilePath)
+		l, err := config.ParseLock(conf.LockfilePath)
 		if err != nil {
 			return fmt.Errorf("parsing lockfile: %w", err)
 		}

diff --git a/command/cli/purge.go b/command/cli/purge.go
@@ -28,7 +28,7 @@ var BindlPurge = &cobra.Command{
 	Long: `Remove downloaded programs from cache, which are not listed in the lockfile.
 Passing --all would remove all existing programs regardless of lockfile.`,
 	RunE: func(cmd *cobra.Command, names []string) error {
-		return command.Purge(cmd.Context(), defaultConfig, bindlPurgeAll, bindlPurgeDryRun)
+		return command.Purge(cmd.Context(), conf, bindlPurgeAll, bindlPurgeDryRun)
 	},
 }
 

diff --git a/command/cli/sync.go b/command/cli/sync.go
@@ -31,7 +31,7 @@ file specifications (i.e. bindl.yaml), ensuring that checksums exists in
 lockfile for all desired platforms and programs.`,
 	Args: cobra.NoArgs,
 	RunE: func(cmd *cobra.Command, args []string) error {
-		return command.Sync(cmd.Context(), defaultConfig, bindlSyncStdout)
+		return command.Sync(cmd.Context(), conf, bindlSyncStdout)
 	},
 }
 

diff --git a/command/cli/verify.go b/command/cli/verify.go
@@ -29,7 +29,7 @@ will be selected.`,
 	RunE: func(cmd *cobra.Command, names []string) error {
 		return command.IterateLockfilePrograms(
 			cmd.Context(),
-			defaultConfig,
+			conf,
 			names,
 			command.Verify)
 	},