Maxim Belkin
db561eb7b9
utils/ruby.sh: setup-ruby: handle 'vendor-install' cmd early
...
Exit from the 'setup-ruby' function when user issued
`vendor-install` command.
We do so instead of wrapping everything in
```sh
if [[ "$HOMEBREW_COMMAND" != "vendor-install" ]]
```
`git diff` when whitespaces are ignored:
$ git diff -w
diff --git a/Library/Homebrew/utils/ruby.sh b/Library/Homebrew/utils/ruby.sh
index 7974e909c..4be204309 100644
--- a/Library/Homebrew/utils/ruby.sh
+++ b/Library/Homebrew/utils/ruby.sh
@@ -27,8 +27,11 @@ If there's no Homebrew Portable Ruby available for your processor:
unset HOMEBREW_RUBY_PATH
- if [[ "$HOMEBREW_COMMAND" != "vendor-install" ]]
+ if [[ "$HOMEBREW_COMMAND" == "vendor-install" ]]
then
+ return 0
+ fi
+
if [[ -x "$vendor_ruby_path" ]]
then
HOMEBREW_RUBY_PATH="$vendor_ruby_path"
@@ -85,7 +88,6 @@ If there's no Homebrew Portable Ruby available for your processor:
HOMEBREW_RUBY_PATH="$vendor_ruby_path"
fi
fi
- fi
export HOMEBREW_RUBY_PATH
}
2020-05-21 15:06:21 -05:00
Maxim Belkin
8dcb1636ce
utils/ruby.sh: add explanatory comments
2020-05-20 12:29:45 -05:00
Maxim Belkin
dcc486fa9e
utils/ruby.sh: find usable Ruby from PATH only
2020-05-19 12:24:00 -05:00
Maxim Belkin
b4267d80e4
utils/ruby.sh: avoid nested ifs
2020-05-17 16:32:06 -05:00
Maxim Belkin
083f56fafe
utils/ruby.sh: quote HOMEBREW_RUBY_PATH when calling test-ruby
2020-05-15 16:35:42 -05:00
Maxim Belkin
f7e0705164
utils/ruby.sh: try installing portable Ruby ...
...
when no usable Ruby is found.
2020-05-15 15:12:20 -05:00
Maxim Belkin
44ef1abd1f
utils/ruby.sh: suppress standard error in test-ruby
2020-05-15 15:04:06 -05:00
Maxim Belkin
ec6e449f4f
utils/ruby.sh: unset HOMEBREW_RUBY_PATH unconditionally
2020-05-15 14:21:51 -05:00
Maxim Belkin
d21ecffae6
utils/ruby.sh: break down long ruby code in test-ruby
2020-05-15 14:20:03 -05:00
Maxim Belkin
cbc266bf0e
utils/ruby.sh: split long line in test-ruby() function
...
Co-authored-by: Mike McQuaid <mike@mikemcquaid.com>
2020-05-15 13:49:22 -05:00
Maxim Belkin
328c75fc33
Move logic related to HOMEBREW_RUBY_PATH to utils/ruby.sh
2020-05-15 10:30:45 -05:00
Maxim Belkin
1cba5821fd
cmd/update.sh: define conditions for unsetting HOMEBREW_RUBY_PATH
2020-05-12 11:50:12 -05:00
Maxim Belkin
9124e07b54
cmd/update.sh: keep HOMEBREW_RUBY_PATH set when updating
2020-05-11 10:47:03 -05:00
Mike McQuaid
fa980e9c42
Merge pull request #7497 from maxim-belkin/reorder-things
...
brew.sh: check versions of proper cURL and Git
2020-05-11 14:09:59 +01:00
Maxim Belkin
5be4682ecb
brew.sh: add an empty line for code readability
...
Co-authored-by: Mike McQuaid <mike@mikemcquaid.com>
2020-05-11 07:30:25 -05:00
Maxim Belkin
6455264716
brew.sh: stop if HOMEBREW_GIT_PATH is too old
2020-05-11 07:21:47 -05:00
Maxim Belkin
6ba7ace66a
brew.sh: stop if HOMEBREW_CURL_PATH is too old
2020-05-11 07:17:26 -05:00
Maxim Belkin
6ff307c456
brew.sh: remove unnecessary empty line
...
Co-authored-by: Mike McQuaid <mike@mikemcquaid.com>
2020-05-11 05:18:04 -05:00
Mike McQuaid
806bdee516
Merge pull request #7124 from MichelleNguy/brew-upgrade
...
Fetch formula resources before unlinking during upgrade.
2020-05-11 10:03:43 +01:00
Mike McQuaid
4c96ed95da
Merge pull request #7544 from Homebrew/workflow-fix-docker-tag
...
workflows: fix docker hub pushing
2020-05-11 09:57:49 +01:00
Dawid Dziurla
95c6d3797d
workflows: login without specifying registry
2020-05-11 10:38:38 +02:00
Mike McQuaid
08a9f0e1c0
Use FormulaInstaller#fetch before #prelude.
2020-05-11 09:38:26 +01:00
Mike McQuaid
48918bb5e3
formula_installer: add fetch_dependency method.
...
This uses `FormulaInstaller#fetch` to recursively fetch dependencies
through the dependency tree and allows `install_dependency` to not
do any fetching.
2020-05-11 09:38:26 +01:00
Michelle Nguyen
2264c08cee
Fetch formula resources before unlinking during upgrade.
...
Fixes #6374 .
2020-05-11 09:37:56 +01:00
Dawid Dziurla
9ecc04fbe4
workflows: fix docker tag
2020-05-11 10:21:08 +02:00
Mike McQuaid
fc56a3d354
Merge pull request #7536 from MikeMcQuaid/official-vendor-taps
...
docs/How-to-Create-and-Maintain-a-Tap: official vendor taps.
2020-05-11 08:47:21 +01:00
Mike McQuaid
35e487064e
Merge pull request #7537 from MikeMcQuaid/cli_parser_formulae
...
Replace ARGV#flags_only with Homebrew.args.flags_only
2020-05-11 08:47:12 +01:00
Mike McQuaid
1c656fb584
Merge pull request #7538 from MikeMcQuaid/bottle_arch
...
Replace ARGV#bottle_arch with Homebrew.args.bottle_arch
2020-05-11 08:46:57 +01:00
Mike McQuaid
380e2daf09
Merge pull request #7539 from MikeMcQuaid/argv_include
...
Cleanup ARGV.include? usage
2020-05-11 08:46:46 +01:00
Mike McQuaid
1a7cda00d7
Merge pull request #7179 from nandahkrishna/add-livecheck-dsl
...
Livecheck Formula DSL
2020-05-11 08:46:27 +01:00
Mike McQuaid
a462177142
Merge pull request #7542 from Homebrew/dependabot/bundler/Library/Homebrew/rspec-expectations-3.9.2
...
build(deps): bump rspec-expectations from 3.9.1 to 3.9.2 in /Library/Homebrew
2020-05-11 08:45:53 +01:00
Mike McQuaid
9d8fb7a0f6
Merge pull request #7505 from sjackman/docker-hub
...
tests.yml: Deploy the Docker image to Docker Hub
2020-05-11 08:45:42 +01:00
dependabot-preview[bot]
21a3e306ed
build(deps): bump rspec-expectations in /Library/Homebrew
...
Bumps [rspec-expectations](https://github.com/rspec/rspec-expectations ) from 3.9.1 to 3.9.2.
- [Release notes](https://github.com/rspec/rspec-expectations/releases )
- [Changelog](https://github.com/rspec/rspec-expectations/blob/master/Changelog.md )
- [Commits](https://github.com/rspec/rspec-expectations/compare/v3.9.1...v3.9.2 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-05-11 05:57:30 +00:00
nandahkrishna
77e74e7e69
Adding livecheck Formula DSL
2020-05-11 09:41:13 +05:30
Bo Anderson
c0f5a52d85
Merge pull request #7532 from Bo98/bintray-url-encode
...
bintray: url encode where needed
2.2.16
2020-05-10 21:53:37 +01:00
Mike McQuaid
952f8eaac5
Merge pull request #7541 from miketheman/miketheman/fix-uninstall-paths
...
cmd/uninstall: fix Array comparison
2020-05-10 19:50:22 +01:00
Mike McQuaid
a3474e8361
uninstall: tweak paths array logic.
2020-05-10 19:22:54 +01:00
Mike Fiedler
e4823ea6fe
cmd/uninstall: fix Array comparison
...
In #7526 a comparison for `paths` was introduced, but if `paths` is ever
`nil`, this triggers an error.
Coercing the variable to an Array should alleviate this problem, as
`nil.to_a` produces an empty and comparable Array.
Fixes #7540
Signed-off-by: Mike Fiedler <miketheman@gmail.com>
2020-05-10 11:28:42 -04:00
Mike McQuaid
270fd422dc
Merge pull request #7534 from MikeMcQuaid/outdated-version
...
Formula#outdated_kegs: check versions aren't identical.
2020-05-10 15:30:45 +01:00
Mike McQuaid
5f721c6986
Cleanup ARGV.include? usage
...
Remove usage where `Homebrew.args` could be used instead or, due to the
`Homebrew.args` parsing, there was dead code that was never executed
(and no-one complained about not working).
2020-05-10 15:28:31 +01:00
Mike McQuaid
07b19cba09
Replace ARGV#bottle_arch with Homebrew.args.bottle_arch
...
Part of https://github.com/Homebrew/brew/issues/5730
2020-05-10 15:15:41 +01:00
Mike McQuaid
fa0d454817
Replace ARGV#flags_only with Homebrew.args.flags_only
...
Take two on https://github.com/Homebrew/brew/pull/7490
2020-05-10 15:12:25 +01:00
Mike McQuaid
af278b15de
cli/parser: add formulae method.
...
This removes the coupling on args.formulae before it has been parsed.
2020-05-10 15:10:36 +01:00
Mike McQuaid
4cdc2a5c81
docs/How-to-Create-and-Maintain-a-Tap: official vendor taps.
...
Explain our policies around "Official Vendor Taps" and clarify the
formulae naming section.
Inspired by discussion in
https://discourse.brew.sh/t/maintenance-of-formulas-by-vendor/7649/ .
2020-05-10 14:15:27 +01:00
Mike McQuaid
5685f379ef
Formula#outdated_kegs: check versions aren't identical.
...
Even if the `version_scheme` does not match: we should never try to
`upgrade` (or show `outdated`) for two identical `pkg_version`s.
If this is ever needed: a `revision` bump should be done instead.
Fixes #7507
2020-05-10 13:42:55 +01:00
Mike McQuaid
7bd454746e
Merge pull request #7526 from MikeMcQuaid/uninstall-list-files
...
cmd/uninstall: note etc files that stay around.
2020-05-10 13:36:10 +01:00
Bo Anderson
65d7036c19
bintray: url encode where needed
2020-05-10 01:48:29 +01:00
Issy Long
b926eeb0d6
Merge pull request #7531 from Takashiidobe/patch-1
...
grammar fix for How-To-Create-and-Maintain-a-Tap
2020-05-09 16:23:51 +01:00
Takashi Idobe
9cf43a181c
grammar fix for How-To-Create-and-Maintain-a-Tap
...
changing `with you github username` to `with your github username`.
2020-05-09 09:55:09 -05:00
FX Coudert
7750ae1983
Merge pull request #7530 from Bo98/gcc-10-version
...
development_tools: fix GCC 10 version detection
2020-05-09 16:41:21 +02:00