From d9f13a3b125e07f912568f8b6426bf4fa7945f44 Mon Sep 17 00:00:00 2001
From: Joseph Wright <rjosephwright@gmail.com>
Date: Wed, 8 Nov 2017 09:40:59 -0500
Subject: [PATCH] refactor: set default value of `bindir` in defaults pipe

Rather than using a conditional to check if `bindir` has been set,
use the defaults pipe to set it to `/usr/local/bin` if it has not
been set in the config file.
---
 pipeline/defaults/defaults.go | 7 +++++++
 pipeline/fpm/fpm.go           | 7 +------
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/pipeline/defaults/defaults.go b/pipeline/defaults/defaults.go
index 065295596..29ce9844d 100644
--- a/pipeline/defaults/defaults.go
+++ b/pipeline/defaults/defaults.go
@@ -75,6 +75,7 @@ func (Pipe) Run(ctx *context.Context) error { // nolint: gocyclo
 
 	err := setArchiveDefaults(ctx)
 	setDockerDefaults(ctx)
+	setFpmDefaults(ctx)
 	log.WithField("config", ctx.Config).Debug("defaults set")
 	return err
 }
@@ -181,3 +182,9 @@ func setArchiveDefaults(ctx *context.Context) error {
 	}
 	return nil
 }
+
+func setFpmDefaults(ctx *context.Context) {
+	if ctx.Config.FPM.Bindir == "" {
+		ctx.Config.FPM.Bindir = "/usr/local/bin"
+	}
+}
diff --git a/pipeline/fpm/fpm.go b/pipeline/fpm/fpm.go
index 09149751e..507eaf559 100644
--- a/pipeline/fpm/fpm.go
+++ b/pipeline/fpm/fpm.go
@@ -75,11 +75,6 @@ func create(ctx *context.Context, format, folder, arch string, binaries []contex
 	log.WithField("file", file).WithField("workdir", dir).Info("creating fpm archive")
 	var options = basicOptions(ctx, dir, format, arch, file)
 
-	bindir := "/usr/local/bin"
-	if ctx.Config.FPM.Bindir != "" {
-		bindir = ctx.Config.FPM.Bindir
-	}
-
 	for _, binary := range binaries {
 		// This basically tells fpm to put the binary in the bindir, e.g. /usr/local/bin
 		// binary=/usr/local/bin/binary
@@ -89,7 +84,7 @@ func create(ctx *context.Context, format, folder, arch string, binaries []contex
 		options = append(options, fmt.Sprintf(
 			"%s=%s",
 			binary.Path,
-			filepath.Join(bindir, binary.Name),
+			filepath.Join(ctx.Config.FPM.Bindir, binary.Name),
 		))
 	}