Merge tag Homebrew/1.8.1 into Linuxbrew/master

Conflicts:
	Dockerfile
	Library/Homebrew/diagnostic.rb
	Library/Homebrew/formula_installer.rb
	Library/Homebrew/test/formula_installer_bottle_spec.rb
	Library/Homebrew/test/spec_helper.rb
	README.md

Author: sjackman

.gitignore

@@ -78,6 +78,8 @@
 !/CHANGELOG.md
 !/CODE_OF_CONDUCT.md
 !/CONTRIBUTING.md
+!/Dockerfile
+!/Dockerfile.test.yml
 !/LICENSE.txt
 !/README.md
 !/Dockerfile

.travis.yml

@@ -13,6 +13,9 @@ branches:
   only:
     - master
 
+env:
+  - HOMEBREW_FORCE_HOMEBREW_ON_LINUX=1
+
 before_install:
   - HOMEBREW_REPOSITORY="$(brew --repo)"
   - sudo chown -R "$USER" "$HOMEBREW_REPOSITORY"
@@ -24,7 +27,7 @@ before_install:
   - travis_retry git clone --depth=1 https://github.com/Homebrew/homebrew-test-bot Library/Taps/homebrew/homebrew-test-bot
 
 script:
-  - brew test-bot
+  - travis_wait 60 brew test-bot
 
 notifications:
   slack:

Dockerfile

@@ -2,7 +2,23 @@ FROM ubuntu:xenial
 LABEL maintainer="Shaun Jackman <[email protected]>"
 
 RUN apt-get update \
-	&& apt-get install -y --no-install-recommends bzip2 ca-certificates curl file fonts-dejavu-core g++ git locales make openssh-client patch sudo uuid-runtime \
+	&& apt-get install -y --no-install-recommends software-properties-common \
+	&& add-apt-repository -y ppa:git-core/ppa \
+	&& apt-get update \
+	&& apt-get install -y --no-install-recommends \
+		bzip2 \
+		ca-certificates \
+		curl \
+		file \
+		fonts-dejavu-core \
+		g++ \
+		git \
+		locales \
+		make \
+		openssh-client \
+		patch \
+		sudo \
+		uuid-runtime \
 	&& rm -rf /var/lib/apt/lists/*
 
 RUN localedef -i en_US -f UTF-8 en_US.UTF-8 \

Dockerfile.test.yml

@@ -0,0 +1,3 @@
+sut:
+  build: .
+  command: brew test-bot

Library/Homebrew/brew.rb

@@ -37,8 +37,8 @@
   homebrew_path = PATH.new(ENV["HOMEBREW_PATH"])
 
   # Add SCM wrappers.
-  path.append(HOMEBREW_SHIMS_PATH/"scm")
-  homebrew_path.append(HOMEBREW_SHIMS_PATH/"scm")
+  path.prepend(HOMEBREW_SHIMS_PATH/"scm")
+  homebrew_path.prepend(HOMEBREW_SHIMS_PATH/"scm")
 
   ENV["PATH"] = path
 

Library/Homebrew/brew.sh

@@ -55,6 +55,12 @@ git() {
   "$HOMEBREW_LIBRARY/Homebrew/shims/scm/git" "$@"
 }
 
+numeric() {
+  # Condense the exploded argument into a single return value.
+  # shellcheck disable=SC2086,SC2183
+  printf "%01d%02d%02d%02d" ${1//./ }
+}
+
 HOMEBREW_VERSION="$(git -C "$HOMEBREW_REPOSITORY" describe --tags --dirty --abbrev=7 2>/dev/null)"
 HOMEBREW_USER_AGENT_VERSION="$HOMEBREW_VERSION"
 if [[ -z "$HOMEBREW_VERSION" ]]
@@ -99,7 +105,8 @@ then
     HOMEBREW_FORCE_BREWED_CURL="1"
   fi
 
-  # The system Git is too old for some Homebrew functionality we rely on.
+  # The system Git on macOS versions before Sierra is too old for some Homebrew functionality we rely on.
+  HOMEBREW_MINIMUM_GIT_VERSION="2.14.3"
   if [[ "$HOMEBREW_MACOS_VERSION_NUMERIC" -lt "101200" ]]
   then
     HOMEBREW_FORCE_BREWED_GIT="1"
@@ -114,6 +121,25 @@ else
   : "${HOMEBREW_OS_VERSION:=$(uname -r)}"
   HOMEBREW_OS_USER_AGENT_VERSION="$HOMEBREW_OS_VERSION"
 
+  # Ensure the system Curl is a version that supports modern HTTPS certificates.
+  HOMEBREW_MINIMUM_CURL_VERSION="7.41.0"
+  system_curl_version_output="$($(command -v curl) --version 2>/dev/null)"
+  system_curl_name_and_version="${system_curl_version_output%% (*}"
+  if [[ $(numeric "${system_curl_name_and_version##* }") -lt $(numeric "$HOMEBREW_MINIMUM_CURL_VERSION") ]]
+  then
+    HOMEBREW_SYSTEM_CURL_TOO_OLD="1"
+    HOMEBREW_FORCE_BREWED_CURL="1"
+  fi
+
+  # Ensure the system Git is at or newer than the minimum required version.
+  # Git 2.7.4 is the version of git on Ubuntu 16.04 LTS (Xenial Xerus).
+  HOMEBREW_MINIMUM_GIT_VERSION="2.7.0"
+  system_git_version_output="$($(command -v git) --version 2>/dev/null)"
+  if [[ $(numeric "${system_git_version_output##* }") -lt $(numeric "$HOMEBREW_MINIMUM_GIT_VERSION") ]]
+  then
+    HOMEBREW_FORCE_BREWED_GIT="1"
+  fi
+
   CACHE_HOME="${XDG_CACHE_HOME:-${HOME}/.cache}"
   HOMEBREW_CACHE="${HOMEBREW_CACHE:-${CACHE_HOME}/Homebrew}"
   HOMEBREW_SYSTEM_TEMP="/tmp"
@@ -153,8 +179,9 @@ else
 fi
 
 HOMEBREW_USER_AGENT="$HOMEBREW_PRODUCT/$HOMEBREW_USER_AGENT_VERSION ($HOMEBREW_SYSTEM; $HOMEBREW_PROCESSOR $HOMEBREW_OS_USER_AGENT_VERSION)"
-HOMEBREW_CURL_VERSION="$("$HOMEBREW_CURL" --version 2>/dev/null | head -n1 | awk '{print $1"/"$2}')"
-HOMEBREW_USER_AGENT_CURL="$HOMEBREW_USER_AGENT $HOMEBREW_CURL_VERSION"
+curl_version_output="$("$HOMEBREW_CURL" --version 2>/dev/null)"
+curl_name_and_version="${curl_version_output%% (*}"
+HOMEBREW_USER_AGENT_CURL="$HOMEBREW_USER_AGENT ${curl_name_and_version// //}"
 
 # Declared in bin/brew
 export HOMEBREW_BREW_FILE
@@ -172,6 +199,7 @@ export HOMEBREW_SYSTEM
 export HOMEBREW_CURL
 export HOMEBREW_SYSTEM_CURL_TOO_OLD
 export HOMEBREW_GIT
+export HOMEBREW_MINIMUM_GIT_VERSION
 export HOMEBREW_PROCESSOR
 export HOMEBREW_PRODUCT
 export HOMEBREW_OS_VERSION

Library/Homebrew/cask/artifact/abstract_uninstall.rb

@@ -169,7 +169,9 @@ def uninstall_signal(*signals, command: nil, **_)
         end
       end
 
-      def uninstall_login_item(*login_items, command: nil, **_)
+      def uninstall_login_item(*login_items, command: nil, upgrade: false, **_)
+        return if upgrade
+
         login_items.each do |name|
           ohai "Removing login item #{name}"
           command.run!(

Library/Homebrew/cask/installer.rb

@@ -424,7 +424,7 @@ def uninstall_artifacts(clear: false)
         next unless artifact.respond_to?(:uninstall_phase)
 
         odebug "Un-installing artifact of class #{artifact.class}"
-        artifact.uninstall_phase(command: @command, verbose: verbose?, skip: clear, force: force?)
+        artifact.uninstall_phase(command: @command, verbose: verbose?, skip: clear, force: force?, upgrade: upgrade?)
       end
     end
 

Library/Homebrew/cli_parser.rb

@@ -42,8 +42,12 @@ def post_initialize
 
       def switch(*names, description: nil, env: nil, required_for: nil, depends_on: nil)
         global_switch = names.first.is_a?(Symbol)
-        names, env, description = common_switch(*names) if global_switch
-        description = option_to_description(*names) if description.nil?
+        names, env, default_description = common_switch(*names) if global_switch
+        if description.nil? && global_switch
+          description = default_description
+        elsif description.nil?
+          description = option_to_description(*names)
+        end
         process_option(*names, description)
         @parser.on(*names, *wrap_option_desc(description)) do
           enable_switch(*names)
@@ -72,20 +76,24 @@ def comma_array(name, description: nil)
         end
       end
 
-      def flag(name, description: nil, required_for: nil, depends_on: nil)
-        if name.end_with? "="
+      def flag(*names, description: nil, required_for: nil, depends_on: nil)
+        if names.any? { |name| name.end_with? "=" }
           required = OptionParser::REQUIRED_ARGUMENT
-          name.chomp! "="
         else
           required = OptionParser::OPTIONAL_ARGUMENT
         end
-        description = option_to_description(name) if description.nil?
-        process_option(name, description)
-        @parser.on(name, *wrap_option_desc(description), required) do |option_value|
-          Homebrew.args[option_to_name(name)] = option_value
+        names.map! { |name| name.chomp "=" }
+        description = option_to_description(*names) if description.nil?
+        process_option(*names, description)
+        @parser.on(*names, *wrap_option_desc(description), required) do |option_value|
+          names.each do |name|
+            Homebrew.args[option_to_name(name)] = option_value
+          end
         end
 
-        set_constraints(name, required_for: required_for, depends_on: depends_on)
+        names.each do |name|
+          set_constraints(name, required_for: required_for, depends_on: depends_on)
+        end
       end
 
       def conflicts(*options)
@@ -118,6 +126,7 @@ def parse(cmdline_args = ARGV)
         remaining_args = @parser.parse(cmdline_args)
         check_constraint_violations
         Homebrew.args[:remaining] = remaining_args
+        Homebrew.args.freeze
         @parser
       end
 

Library/Homebrew/cmd/diy.rb

@@ -25,8 +25,10 @@ def diy
       puts "-DCMAKE_INSTALL_PREFIX=#{prefix}"
     elsif File.file? "configure"
       puts "--prefix=#{prefix}"
+    elsif File.file? "meson.build"
+      puts "-Dprefix=#{prefix}"
     else
-      raise "Couldn't determine build system"
+      raise "Couldn't determine build system. You can manually put files into #{prefix}"
     end
   end