From ce93c75f1125086928df49b8d4cea1051c9abdc3 Mon Sep 17 00:00:00 2001 From: Jack Nagel Date: Sat, 8 Mar 2014 19:08:47 -0600 Subject: [PATCH] Remove "--fresh" option from installer Turns out that this doesn't really work at all. `brew install` _never_ reuses options in the first place, and using this option with `brew upgrade` results in some nasty corner cases in passing options to dependencies. --- Library/Contributions/manpages/brew.1.md | 5 +---- Library/Homebrew/extend/ARGV.rb | 1 - Library/Homebrew/formula_installer.rb | 2 +- share/man/man1/brew.1 | 5 +---- 4 files changed, 3 insertions(+), 10 deletions(-) diff --git a/Library/Contributions/manpages/brew.1.md b/Library/Contributions/manpages/brew.1.md index 5f20c8cc12..96a5f94856 100644 --- a/Library/Contributions/manpages/brew.1.md +++ b/Library/Contributions/manpages/brew.1.md @@ -153,7 +153,7 @@ Note that these flags should only appear after a command. Print a JSON representation of . Currently the only accepted value for is `v1`. - * `install [--debug] [--env=] [--ignore-dependencies] [--only-dependencies] [--fresh] [--cc=] [--build-from-source] [--devel|--HEAD]` : + * `install [--debug] [--env=] [--ignore-dependencies] [--only-dependencies] [--cc=] [--build-from-source] [--devel|--HEAD]` : Install . is usually the name of the formula to install, but it can be specified @@ -175,9 +175,6 @@ Note that these flags should only appear after a command. If `--only-dependencies` is passed, install the dependencies with specified options but do not install the specified formula. - If `--fresh` is passed, the installation process will not re-use any - options from previous installs. - If `--cc=` is passed, attempt to compile using . should be the name of the compiler's executable, for instance `gcc-4.2` for Apple's GCC 4.2, or `gcc-4.8` for a Homebrew-provided GCC diff --git a/Library/Homebrew/extend/ARGV.rb b/Library/Homebrew/extend/ARGV.rb index 476ef62df0..5bc88142b2 100644 --- a/Library/Homebrew/extend/ARGV.rb +++ b/Library/Homebrew/extend/ARGV.rb @@ -187,7 +187,6 @@ module HomebrewArgvExtension --build-bottle --debug -d --devel - --fresh --interactive -i --HEAD ] diff --git a/Library/Homebrew/formula_installer.rb b/Library/Homebrew/formula_installer.rb index d341094f88..e93263c084 100644 --- a/Library/Homebrew/formula_installer.rb +++ b/Library/Homebrew/formula_installer.rb @@ -394,7 +394,7 @@ class FormulaInstaller def build_argv opts = Options.coerce(sanitized_ARGV_options) - opts.concat(options) unless opts.include? "--fresh" + opts.concat(options) opts << Option.new("--build-from-source") # don't download bottle end diff --git a/share/man/man1/brew.1 b/share/man/man1/brew.1 index fda7e9032d..621425691d 100644 --- a/share/man/man1/brew.1 +++ b/share/man/man1/brew.1 @@ -174,7 +174,7 @@ To view formula history locally: \fBbrew log \-p \fR\. Print a JSON representation of \fIformula\fR\. Currently the only accepted value for \fIversion\fR is \fBv1\fR\. . .TP -\fBinstall [\-\-debug] [\-\-env=] [\-\-ignore\-dependencies] [\-\-only\-dependencies] [\-\-fresh] [\-\-cc=] [\-\-build\-from\-source] [\-\-devel|\-\-HEAD]\fR \fIformula\fR +\fBinstall [\-\-debug] [\-\-env=] [\-\-ignore\-dependencies] [\-\-only\-dependencies] [\-\-cc=] [\-\-build\-from\-source] [\-\-devel|\-\-HEAD]\fR \fIformula\fR Install \fIformula\fR\. . .IP @@ -196,9 +196,6 @@ If \fB\-\-ignore\-dependencies\fR is passed, skip installing any dependencies of If \fB\-\-only\-dependencies\fR is passed, install the dependencies with specified options but do not install the specified formula\. . .IP -If \fB\-\-fresh\fR is passed, the installation process will not re\-use any options from previous installs\. -. -.IP If \fB\-\-cc=\fR is passed, attempt to compile using \fIcompiler\fR\. \fIcompiler\fR should be the name of the compiler\'s executable, for instance \fBgcc\-4\.2\fR for Apple\'s GCC 4\.2, or \fBgcc\-4\.8\fR for a Homebrew\-provided GCC 4\.8\. . .IP