aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJack Nagel2014-03-08 19:08:47 -0600
committerJack Nagel2014-03-08 19:08:47 -0600
commit8cdf4d8ebf439eb9a9ffcaa0e455ced9459e1e41 (patch)
treebafc768576a2e062dd6c5343bb3114c04bf8443e
parent3c9a197761423d57d2408f61cd27bf44820b4528 (diff)
downloadhomebrew-8cdf4d8ebf439eb9a9ffcaa0e455ced9459e1e41.tar.bz2
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.
-rw-r--r--Library/Contributions/manpages/brew.1.md5
-rw-r--r--Library/Homebrew/extend/ARGV.rb1
-rw-r--r--Library/Homebrew/formula_installer.rb2
-rw-r--r--share/man/man1/brew.15
4 files changed, 3 insertions, 10 deletions
diff --git a/Library/Contributions/manpages/brew.1.md b/Library/Contributions/manpages/brew.1.md
index 5f20c8cc1..96a5f9485 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 <formula>. Currently the only accepted value
for <version> is `v1`.
- * `install [--debug] [--env=<std|super>] [--ignore-dependencies] [--only-dependencies] [--fresh] [--cc=<compiler>] [--build-from-source] [--devel|--HEAD]` <formula>:
+ * `install [--debug] [--env=<std|super>] [--ignore-dependencies] [--only-dependencies] [--cc=<compiler>] [--build-from-source] [--devel|--HEAD]` <formula>:
Install <formula>.
<formula> 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=<compiler>` is passed, attempt to compile using <compiler>.
<compiler> 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 476ef62df..5bc88142b 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 d341094f8..e93263c08 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 fda7e9032..621425691 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 <formula>\fR\.
Print a JSON representation of \fIformula\fR\. Currently the only accepted value for \fIversion\fR is \fBv1\fR\.
.
.TP
-\fBinstall [\-\-debug] [\-\-env=<std|super>] [\-\-ignore\-dependencies] [\-\-only\-dependencies] [\-\-fresh] [\-\-cc=<compiler>] [\-\-build\-from\-source] [\-\-devel|\-\-HEAD]\fR \fIformula\fR
+\fBinstall [\-\-debug] [\-\-env=<std|super>] [\-\-ignore\-dependencies] [\-\-only\-dependencies] [\-\-cc=<compiler>] [\-\-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=<compiler>\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