Skip to content
This repository was archived by the owner on Feb 27, 2018. It is now read-only.

Commit 6b12c9b

Browse files
Revise clobber flag default code
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
1 parent 051d766 commit 6b12c9b

1 file changed

Lines changed: 5 additions & 6 deletions

File tree

config.go

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -93,12 +93,11 @@ func config() (*flag.FlagSet, error) {
9393
B2D.Dir = dir
9494
flags.StringVar(&B2D.ISOURL, "iso-url", "https://api.github.com/repos/boot2docker/boot2docker/releases", "source URL to provision the boot2docker ISO image.")
9595
flags.StringVar(&B2D.ISO, "iso", filepath.Join(dir, "boot2docker.iso"), "path to boot2docker ISO image.")
96-
if runtime.GOOS == "darwin" {
97-
// clobber by default
98-
flags.BoolVar(&B2D.Clobber, "clobber", true, "overwrite Docker client binary on boot2docker upgrade")
99-
} else {
100-
flags.BoolVar(&B2D.Clobber, "clobber", false, "overwrite Docker client binary on boot2docker upgrade")
101-
}
96+
97+
// clobber (overwrite client binary) by default on OSX. it's more likely that
98+
// users have installed through package manager on Linux, and if so, they should
99+
// upgrade that way.
100+
flags.BoolVar(&B2D.Clobber, "clobber", (runtime.GOOS == "darwin"), "overwrite Docker client binary on boot2docker upgrade")
102101

103102
flags.BoolVar(&B2D.ForceUpgradeDownload, "force-upgrade-download", false, "always download on boot2docker upgrade, never skip")
104103

0 commit comments

Comments
 (0)