Core/formula separation Part 2(b)0.9.9

* move shell completion scripts to where can be auto picked up

Let's use switching new remote as opportunity to put shell completion
scripts to where they should be and avoid git conflict during the process.

* add Library/Formula and Library/Aliases symlinks

Formulae and Aliases has been relocated to homebrew/core tap.
The symlinks are pointed to new location to keep backward compatibility.

* remove formula_renames and tap_migrations

They have been replaced by the json files in the core tap.

* update: set new remote

* bump Homebrew version to 0.9.9

8 files changed, 11 insertions, 1093 deletions

diff --git a/Library/Aliases b/Library/Aliases
new file mode 120000
index 000000000..a6d560e69
--- /dev/null
+++ b/Library/Aliases
@@ -0,0 +1 @@
+Taps/homebrew/homebrew-core/Aliases
\ No newline at end of file
diff --git a/Library/Contributions/brew_bash_completion.sh b/Library/Contributions/brew_bash_completion.sh
deleted file mode 100644
index d9ad1c9cd..000000000
--- a/Library/Contributions/brew_bash_completion.sh
+++ /dev/null
@@ -1,657 +0,0 @@
-# Bash completion script for brew(1)
-#
-# To use, add the following to your .bashrc:
-#
-#    . $(brew --repository)/Library/Contributions/brew_bash_completion.sh
-#
-# Alternatively, if you have installed the bash-completion package,
-# you can create a symlink to this file in one of the following directories:
-#
-#    $(brew --prefix)/etc/bash_completion.d
-#    $(brew --prefix)/share/bash-completion/completions
-#
-# Installing to etc/bash_completion.d will cause bash-completion to load
-# it automatically at shell startup time. If you choose to install it to
-# share/bash-completion/completions, it will be loaded on-demand (i.e. the
-# first time you invoke the `brew` command in a shell session).
-
-__brewcomp_words_include ()
-{
-    local i=1
-    while [[ $i -lt $COMP_CWORD ]]; do
-        if [[ "${COMP_WORDS[i]}" = "$1" ]]; then
-            return 0
-        fi
-        i=$((++i))
-    done
-    return 1
-}
-
-# Find the previous non-switch word
-__brewcomp_prev ()
-{
-    local idx=$((COMP_CWORD - 1))
-    local prv="${COMP_WORDS[idx]}"
-    while [[ $prv == -* ]]; do
-        idx=$((--idx))
-        prv="${COMP_WORDS[idx]}"
-    done
-    echo "$prv"
-}
-
-__brewcomp ()
-{
-    # break $1 on space, tab, and newline characters,
-    # and turn it into a newline separated list of words
-    local list s sep=$'\n' IFS=$' '$'\t'$'\n'
-    local cur="${COMP_WORDS[COMP_CWORD]}"
-
-    for s in $1; do
-        __brewcomp_words_include "$s" && continue
-        list="$list$s$sep"
-    done
-
-    IFS=$sep
-    COMPREPLY=($(compgen -W "$list" -- "$cur"))
-}
-
-# Don't use __brewcomp() in any of the __brew_complete_foo functions, as
-# it is too slow and is not worth it just for duplicate elimination.
-__brew_complete_formulae ()
-{
-    local cur="${COMP_WORDS[COMP_CWORD]}"
-    local lib=$(brew --repository)/Library
-    local taps=${lib}/Taps
-    local ff=$(\ls ${lib}/Formula 2>/dev/null | sed 's/\.rb//g')
-    local af=$(\ls ${lib}/Aliases 2>/dev/null)
-    local tf file
-
-    for file in ${taps}/*/*/*.rb ${taps}/*/*/Formula/*.rb ${taps}/*/*/HomebrewFormula/*.rb; do
-        [ -f "$file" ] || continue
-        file=${file/"Formula/"/}
-        file=${file/"HomebrewFormula/"/}
-        file=${file#${lib}/Taps/}
-        file=${file%.rb}
-        file=${file/homebrew-/}
-        tf="${tf} ${file}"
-    done
-
-    COMPREPLY=($(compgen -W "$ff $af $tf" -- "$cur"))
-}
-
-__brew_complete_installed ()
-{
-    local cur="${COMP_WORDS[COMP_CWORD]}"
-    local inst=$(\ls $(brew --cellar))
-    COMPREPLY=($(compgen -W "$inst" -- "$cur"))
-}
-
-__brew_complete_outdated ()
-{
-    local cur="${COMP_WORDS[COMP_CWORD]}"
-    local od=$(brew outdated --quiet)
-    COMPREPLY=($(compgen -W "$od" -- "$cur"))
-}
-
-__brew_complete_versions ()
-{
-    local formula="$1"
-    local versions=$(brew list --versions "$formula")
-    local cur="${COMP_WORDS[COMP_CWORD]}"
-    COMPREPLY=($(compgen -W "$versions" -X "$formula" -- "$cur"))
-}
-
-__brew_complete_logs ()
-{
-    local cur="${COMP_WORDS[COMP_CWORD]}"
-    local logs=$(ls ${HOMEBREW_LOGS:-~/Library/Logs/Homebrew/})
-    COMPREPLY=($(compgen -W "$logs" -- "$cur"))
-}
-
-_brew_switch ()
-{
-    case "$COMP_CWORD" in
-    2)  __brew_complete_installed ;;
-    3)  __brew_complete_versions "${COMP_WORDS[COMP_CWORD-1]}" ;;
-    *)  ;;
-    esac
-}
-
-__brew_complete_tapped ()
-{
-    local taplib=$(brew --repository)/Library/Taps
-    local dir taps
-
-    for dir in ${taplib}/*/*; do
-        [ -d "$dir" ] || continue
-        dir=${dir#${taplib}/}
-        dir=${dir/homebrew-/}
-        taps="$taps $dir"
-    done
-    __brewcomp "$taps"
-}
-
-_brew_tap_unpin ()
-{
-    __brewcomp "$(brew tap --list-pinned)"
-}
-
-_brew_complete_tap ()
-{
-    local cur="${COMP_WORDS[COMP_CWORD]}"
-    case "$cur" in
-    --*)
-        __brewcomp "--repair --list-official --list-pinned"
-        return
-        ;;
-    esac
-    __brewcomp "$(brew tap --list-official)"
-}
-
-_brew_bottle ()
-{
-    local cur="${COMP_WORDS[COMP_CWORD]}"
-    case "$cur" in
-    --*)
-        __brewcomp "--merge --rb --write --root_url="
-        return
-        ;;
-    esac
-    __brew_complete_installed
-}
-
-_brew_cleanup ()
-{
-    __brew_complete_installed
-}
-
-_brew_create ()
-{
-    local cur="${COMP_WORDS[COMP_CWORD]}"
-    case "$cur" in
-    --*)
-        __brewcomp "--autotools --cmake --no-fetch --set-name --set-version"
-        return
-        ;;
-    esac
-}
-
-_brew_deps ()
-{
-    local cur="${COMP_WORDS[COMP_CWORD]}"
-    case "$cur" in
-    --*)
-        __brewcomp "--1 --all --tree"
-        return
-        ;;
-    esac
-    __brew_complete_formulae
-}
-
-_brew_desc ()
-{
-    local cur="${COMP_WORDS[COMP_CWORD]}"
-    case "$cur" in
-    --*)
-        __brewcomp "--search --name --description"
-        return
-        ;;
-    esac
-    __brew_complete_formulae
-}
-
-_brew_doctor () {
-    local cur="${COMP_WORDS[COMP_CWORD]}"
-    __brewcomp "$(brew doctor --list-checks)"
-}
-
-_brew_diy ()
-{
-    local cur="${COMP_WORDS[COMP_CWORD]}"
-    case "$cur" in
-    --*)
-        __brewcomp "--set-name --set-version"
-        return
-        ;;
-    esac
-}
-
-_brew_fetch ()
-{
-    local cur="${COMP_WORDS[COMP_CWORD]}"
-    local prv=$(__brewcomp_prev)
-    case "$cur" in
-    --*)
-        __brewcomp "
-          --deps --force
-          --devel --HEAD
-          --build-from-source --force-bottle --build-bottle
-          --retry
-          $(brew options --compact "$prv" 2>/dev/null)
-          "
-        return
-        ;;
-    esac
-    __brew_complete_formulae
-}
-
-_brew_gist_logs ()
-{
-    local cur="${COMP_WORDS[COMP_CWORD]}"
-    case "$cur" in
-    --*)
-        __brewcomp "--new-issue"
-        return
-        ;;
-    esac
-    __brew_complete_logs
-}
-
-_brew_info ()
-{
-    local cur="${COMP_WORDS[COMP_CWORD]}"
-    case "$cur" in
-    --*)
-        __brewcomp "--all --github --installed --json=v1"
-        return
-        ;;
-    esac
-    __brew_complete_formulae
-}
-
-_brew_install ()
-{
-    local cur="${COMP_WORDS[COMP_CWORD]}"
-    local prv=$(__brewcomp_prev)
-
-    case "$cur" in
-    --*)
-        if __brewcomp_words_include "--interactive"; then
-            __brewcomp "--devel --git --HEAD"
-        else
-            __brewcomp "
-                --build-from-source --build-bottle --force-bottle
-                --debug
-                --devel
-                --HEAD
-                --ignore-dependencies
-                --interactive
-                --only-dependencies
-                --verbose
-                $(brew options --compact "$prv" 2>/dev/null)
-                "
-        fi
-        return
-        ;;
-    esac
-    __brew_complete_formulae
-}
-
-_brew_irb ()
-{
-    local cur="${COMP_WORDS[COMP_CWORD]}"
-    case "$cur" in
-    --*)
-        __brewcomp "--examples"
-        return
-        ;;
-    esac
-}
-
-_brew_link ()
-{
-    local cur="${COMP_WORDS[COMP_CWORD]}"
-    case "$cur" in
-    --*)
-        __brewcomp "--dry-run --overwrite --force"
-        return
-        ;;
-    esac
-    __brew_complete_installed
-}
-
-_brew_linkapps ()
-{
-    local cur="${COMP_WORDS[COMP_CWORD]}"
-    case "$cur" in
-    --*)
-        __brewcomp "--local"
-        return
-        ;;
-    esac
-    __brew_complete_installed
-}
-
-_brew_list ()
-{
-    local allopts="--unbrewed --verbose --pinned --versions --multiple"
-    local cur="${COMP_WORDS[COMP_CWORD]}"
-
-    case "$cur" in
-    --*)
-        # most options to brew-list are mutually exclusive
-        if __brewcomp_words_include "--unbrewed"; then
-            return
-        elif __brewcomp_words_include "--verbose"; then
-            return
-        elif __brewcomp_words_include "--pinned"; then
-            return
-        # --multiple only applies with --versions
-        elif __brewcomp_words_include "--multiple"; then
-            __brewcomp "--versions"
-            return
-        elif __brewcomp_words_include "--versions"; then
-            __brewcomp "--multiple"
-            return
-        else
-            __brewcomp "$allopts"
-            return
-        fi
-        ;;
-    esac
-
-    # --multiple excludes formulae and *implies* --versions...
-    if __brewcomp_words_include "--multiple"; then
-        __brewcomp "--versions"
-    else
-        __brew_complete_installed
-    fi
-}
-
-_brew_log ()
-{
-    # if git-completion is loaded, then we complete git-log options
-    declare -F _git_log >/dev/null || return
-    local cur="${COMP_WORDS[COMP_CWORD]}"
-    case "$cur" in
-    --*)
-        __brewcomp "
-            $__git_log_common_options
-            $__git_log_shortlog_options
-            $__git_log_gitk_options
-            $__git_diff_common_options
-            --walk-reflogs --graph --decorate
-            --abbrev-commit --oneline --reverse
-            "
-        return
-        ;;
-    esac
-    __brew_complete_formulae
-}
-
-_brew_man ()
-{
-    local cur="${COMP_WORDS[COMP_CWORD]}"
-    case "$cur" in
-    --*)
-        __brewcomp "--link --server --verbose"
-        return
-        ;;
-    esac
-}
-
-_brew_options ()
-{
-    local cur="${COMP_WORDS[COMP_CWORD]}"
-    case "$cur" in
-    --*)
-        __brewcomp "--all --compact --installed"
-        return
-        ;;
-    esac
-    __brew_complete_formulae
-}
-
-_brew_outdated ()
-{
-    local cur="${COMP_WORDS[COMP_CWORD]}"
-    case "$cur" in
-    --*)
-        __brewcomp "--quiet --json=v1"
-        return
-        ;;
-    esac
-}
-
-_brew_postinstall ()
-{
-    local cur="${COMP_WORDS[COMP_CWORD]}"
-    case "$cur" in
-    --*)
-        __brewcomp "--debug --sandbox"
-        return
-        ;;
-    esac
-    __brew_complete_installed
-}
-
-_brew_prune ()
-{
-    local cur="${COMP_WORDS[COMP_CWORD]}"
-    case "$cur" in
-    --*)
-        __brewcomp "--dry-run --verbose"
-        return
-        ;;
-    esac
-}
-
-_brew_pull ()
-{
-    local cur="${COMP_WORDS[COMP_CWORD]}"
-    case "$cur" in
-    --*)
-        __brewcomp "--bottle --bump --clean --ignore-whitespace --install --resolve"
-        return
-        ;;
-    esac
-}
-
-_brew_readall ()
-{
-    local cur="${COMP_WORDS[COMP_CWORD]}"
-    case "$cur" in
-    --*)
-        __brewcomp "--syntax"
-        return
-        ;;
-    esac
-    __brew_complete_tapped
-}
-
-_brew_search ()
-{
-    local cur="${COMP_WORDS[COMP_CWORD]}"
-    case "$cur" in
-    --*)
-        __brewcomp "--debian --desc --fedora --fink --macports --opensuse --ubuntu"
-        return
-        ;;
-    esac
-}
-
-_brew_style ()
-{
-    local cur="${COMP_WORDS[COMP_CWORD]}"
-    case "$cur" in
-    --*)
-        __brewcomp "--fix"
-        return
-        ;;
-    esac
-    __brew_complete_formulae
-}
-
-_brew_tap_readme ()
-{
-    local cur="${COMP_WORDS[COMP_CWORD]}"
-    case "$cur" in
-    --*)
-        __brewcomp "--verbose"
-        return
-        ;;
-    esac
-}
-
-_brew_tests ()
-{
-    local cur="${COMP_WORDS[COMP_CWORD]}"
-    case "$cur" in
-    --*)
-        __brewcomp "--verbose"
-        return
-        ;;
-    esac
-}
-
-_brew_uninstall ()
-{
-    local cur="${COMP_WORDS[COMP_CWORD]}"
-    case "$cur" in
-    --*)
-        __brewcomp "--force"
-        return
-        ;;
-    esac
-    __brew_complete_installed
-}
-
-_brew_unpack ()
-{
-    local cur="${COMP_WORDS[COMP_CWORD]}"
-    case "$cur" in
-    --*)
-        __brewcomp "--git --patch --destdir="
-        return
-        ;;
-    esac
-    __brew_complete_formulae
-}
-_brew_update ()
-{
-    local cur="${COMP_WORDS[COMP_CWORD]}"
-    case "$cur" in
-    --*)
-        __brewcomp "--rebase --verbose"
-        return
-        ;;
-    esac
-}
-
-_brew_upgrade ()
-{
-    local cur="${COMP_WORDS[COMP_CWORD]}"
-    local prv=$(__brewcomp_prev)
-
-    case "$cur" in
-    --*)
-        __brewcomp "
-            --all
-            --build-from-source --build-bottle --force-bottle
-            --cleanup
-            --debug
-            --verbose
-            "
-        return
-        ;;
-    esac
-    __brew_complete_outdated
-}
-
-_brew_uses ()
-{
-    local cur="${COMP_WORDS[COMP_CWORD]}"
-    case "$cur" in
-    --*)
-        __brewcomp "--installed --recursive"
-        return
-        ;;
-    esac
-    __brew_complete_formulae
-}
-
-_brew ()
-{
-    local i=1 cmd
-
-    # find the subcommand
-    while [[ $i -lt $COMP_CWORD ]]; do
-        local s="${COMP_WORDS[i]}"
-        case "$s" in
-        --*)
-            cmd="$s"
-            break
-            ;;
-        -*)
-            ;;
-        *)
-            cmd="$s"
-            break
-            ;;
-        esac
-        i=$((++i))
-    done
-
-    if [[ $i -eq $COMP_CWORD ]]; then
-        # Do not auto-complete "instal" abbreviation for "install" command.
-        # Prefix newline to prevent not checking the first command.
-        local cmds=$'\n'"$(brew commands --quiet --include-aliases)"
-        __brewcomp "${cmds/$'\n'instal$'\n'/$'\n'}"
-        return
-    fi
-
-    # subcommands have their own completion functions
-    case "$cmd" in
-    --cache|--cellar|--prefix)  __brew_complete_formulae ;;
-    audit|cat|edit|home)        __brew_complete_formulae ;;
-    test|unlink)                __brew_complete_installed ;;
-    bottle)                     _brew_bottle ;;
-    cleanup)                    _brew_cleanup ;;
-    create)                     _brew_create ;;
-    deps)                       _brew_deps ;;
-    desc)                       _brew_desc ;;
-    doctor|dr)                  _brew_doctor ;;
-    diy|configure)              _brew_diy ;;
-    fetch)                      _brew_fetch ;;
-    gist-logs)                  _brew_gist_logs ;;
-    info|abv)                   _brew_info ;;
-    install|instal|reinstall)   _brew_install ;;
-    irb)                        _brew_irb ;;
-    link|ln)                    _brew_link ;;
-    linkapps|unlinkapps)        _brew_linkapps ;;
-    list|ls)                    _brew_list ;;
-    log)                        _brew_log ;;
-    man)                        _brew_man ;;
-    missing)                    __brew_complete_formulae ;;
-    options)                    _brew_options ;;
-    outdated)                   _brew_outdated ;;
-    pin)                        __brew_complete_formulae ;;
-    postinstall)                _brew_postinstall ;;
-    prune)                      _brew_prune ;;
-    pull)                       _brew_pull ;;
-    readall)                    _brew_readall ;;
-    search|-S)                  _brew_search ;;
-    style)                      _brew_style ;;
-    switch)                     _brew_switch ;;
-    tap)                        _brew_complete_tap ;;
-    tap-readme)                 _brew_tap_readme ;;
-    tap-unpin)                  _brew_tap_unpin ;;
-    tests)                      _brew_tests ;;
-    uninstall|remove|rm)        _brew_uninstall ;;
-    unpack)                     _brew_unpack ;;
-    unpin)                      __brew_complete_formulae ;;
-    untap|tap-info|tap-pin)     __brew_complete_tapped ;;
-    update)                     _brew_update ;;
-    upgrade)                    _brew_upgrade ;;
-    uses)                       _brew_uses ;;
-    *)                          ;;
-    esac
-}
-
-# keep around for compatibility
-_brew_to_completion ()
-{
-    _brew
-}
-
-complete -o bashdefault -o default -F _brew brew
diff --git a/Library/Contributions/brew_zsh_completion.zsh b/Library/Contributions/brew_zsh_completion.zsh
deleted file mode 100644
index d2de5f65f..000000000
--- a/Library/Contributions/brew_zsh_completion.zsh
+++ /dev/null
@@ -1,149 +0,0 @@
-#compdef brew
-#autoload
-
-# Brew ZSH completion function
-# Drop this somewhere in your $fpath (like /usr/share/zsh/site-functions)
-# and rename it _brew
-#
-# altered from _fink
-
-_brew_all_formulae() {
-  formulae=(`brew search`)
-}
-
-_brew_installed_formulae() {
-  installed_formulae=(`brew list`)
-}
-
-_brew_installed_taps() {
-  installed_taps=(`brew tap`)
-}
-
-_brew_official_taps() {
-  official_taps=(`brew tap --list-official`)
-}
-
-_brew_pinned_taps() {
-  pinned_taps=(`brew tap --list-pinned`)
-}
-
-_brew_outdated_formulae() {
-  outdated_formulae=(`brew outdated`)
-}
-
-local -a _1st_arguments
-_1st_arguments=(
-  'audit:check formulae for Homebrew coding style'
-  'cat:display formula file for a formula'
-  'cleanup:uninstall unused and old versions of packages'
-  'commands:show a list of commands'
-  'config:show homebrew and system configuration'
-  'create:create a new formula'
-  'deps:list dependencies and dependants of a formula'
-  'desc:display a description of a formula'
-  'doctor:audits your installation for common issues'
-  'edit:edit a formula'
-  'fetch:download formula resources to the cache'
-  'gist-logs:generate a gist of the full build logs'
-  'home:visit the homepage of a formula or the brew project'
-  'info:information about a formula'
-  'install:install a formula'
-  'reinstall:install a formula anew; re-using its current options'
-  'leaves:show installed formulae that are not dependencies of another installed formula'
-  'link:link a formula'
-  'linkapps:symlink .app bundles provided by formulae into /Applications'
-  'list:list files in a formula or not-installed formulae'
-  'log:git commit log for a formula'
-  'missing:check all installed formuale for missing dependencies.'
-  'migrate:migrate renamed formula to new name'
-  'outdated:list formulae for which a newer version is available'
-  'pin:pin specified formulae'
-  'postinstall:perform post_install for a given formula'
-  'prune:remove dead links'
-  'remove:remove a formula'
-  'search:search for a formula (/regex/ or string)'
-  'switch:switch between different versions of a formula'
-  'tap:tap a new formula repository from GitHub, or list existing taps'
-  'tap-info:information about a tap'
-  'tap-pin:pin a tap'
-  'tap-unpin:unpin a tap'
-  'test-bot:test a formula and build a bottle'
-  'uninstall:uninstall a formula'
-  'unlink:unlink a formula'
-  'unlinkapps:remove symlinked .app bundles provided by formulae from /Applications'
-  'unpin:unpin specified formulae'
-  'untap:remove a tapped repository'
-  'update:fetch latest version of Homebrew and all formulae'
-  'upgrade:upgrade outdated formulae'
-  'uses:show formulae which depend on a formula'
-  `brew commands --quiet --include-aliases`
-)
-
-local expl
-local -a formulae installed_formulae installed_taps official_taps outdated_formulae
-
-_arguments \
-  '(-v)-v[verbose]' \
-  '(--cellar)--cellar[brew cellar]' \
-  '(--env)--env[brew environment]' \
-  '(--repository)--repository[brew repository]' \
-  '(--version)--version[version information]' \
-  '(--prefix)--prefix[where brew lives on this system]' \
-  '(--cache)--cache[brew cache]' \
-  '*:: :->subcmds' && return 0
-
-if (( CURRENT == 1 )); then
-  _describe -t commands "brew subcommand" _1st_arguments
-  return
-fi
-
-case "$words[1]" in
-  install|reinstall|audit|home|homepage|log|info|abv|uses|cat|deps|desc|edit|options|switch)
-    _brew_all_formulae
-    _wanted formulae expl 'all formulae' compadd -a formulae ;;
-  linkapps|unlinkapps)
-    _arguments \
-      '(--local)--local[operate on ~/Applications instead of /Applications]' \
-      '1: :->forms' && return 0
-
-    if [[ "$state" == forms ]]; then
-      _brew_installed_formulae
-      _wanted installed_formulae expl 'installed formulae' compadd -a installed_formulae
-    fi ;;
-  list|ls)
-    _arguments \
-      '(--unbrewed)--unbrewed[files in brew --prefix not controlled by brew]' \
-      '(--pinned)--pinned[list all versions of pinned formulae]' \
-      '(--versions)--versions[list all installed versions of a formula]' \
-      '1: :->forms' && return 0
-
-      if [[ "$state" == forms ]]; then
-        _brew_installed_formulae
-        _wanted installed_formulae expl 'installed formulae' compadd -a installed_formulae
-      fi ;;
-  remove|rm|uninstall|unlink|cleanup|link|ln|pin|unpin)
-    _brew_installed_formulae
-    _wanted installed_formulae expl 'installed formulae' compadd -a installed_formulae ;;
-  search|-S)
-    _arguments \
-      '(--macports)--macports[search the macports repository]' \
-      '(--fink)--fink[search the fink repository]' ;;
-  untap|tap-info|tap-pin)
-    _brew_installed_taps
-    _wanted installed_taps expl 'installed taps' compadd -a installed_taps ;;
-  tap)
-    _brew_official_taps
-    _wanted official_taps expl 'official taps' compadd -a official_taps ;;
-  tap-unpin)
-    _brew_pinned_taps
-    _wanted pinned_taps expl 'pinned taps' compadd -a pinned_taps ;;
-  upgrade)
-    _arguments \
-      '(--cleanup)--cleanup[remove previously installed formula version(s)]' \
-      '1: :->forms' && return 0
-
-    if [[ "$state" == forms ]]; then
-      _brew_outdated_formulae
-      _wanted outdated_formulae expl 'outdated formulae' compadd -a outdated_formulae
-    fi ;;
-esac
diff --git a/Library/Formula b/Library/Formula
new file mode 120000
index 000000000..9028792ad
--- /dev/null
+++ b/Library/Formula
@@ -0,0 +1 @@
+Taps/homebrew/homebrew-core/Formula
\ No newline at end of file
diff --git a/Library/Homebrew/cmd/update.sh b/Library/Homebrew/cmd/update.sh
index d0da09575..49dcb5038 100644
--- a/Library/Homebrew/cmd/update.sh
+++ b/Library/Homebrew/cmd/update.sh
@@ -7,26 +7,26 @@ git() {
 }
 
 git_init_if_necessary() {
+  if [[ -n "$HOMEBREW_OSX" ]]
+  then
+    OFFICIAL_REMOTE="https://github.com/Homebrew/brew.git"
+  else
+    OFFICIAL_REMOTE="https://github.com/Linuxbrew/brew.git"
+  fi
+
   if [[ ! -d ".git" ]]
   then
     set -e
     trap '{ rm -rf .git; exit 1; }' EXIT
     git init
     git config --bool core.autocrlf false
-    git config remote.origin.url https://github.com/Homebrew/homebrew.git
+    git config remote.origin.url "$OFFICIAL_REMOTE"
     git config remote.origin.fetch "+refs/heads/*:refs/remotes/origin/*"
     git fetch --force --depth=1 origin refs/heads/master:refs/remotes/origin/master
     git reset --hard origin/master
     SKIP_FETCH_HOMEBREW_REPOSITORY=1
     set +e
     trap - EXIT
-    return
-  fi
-
-  if [[ "$(git remote show origin -n)" = *"mxcl/homebrew"* ]]
-  then
-    git remote set-url origin https://github.com/Homebrew/homebrew.git &&
-    git remote set-url --delete origin ".*mxcl\/homebrew.*"
   fi
 }
 
diff --git a/Library/Homebrew/formula_renames.rb b/Library/Homebrew/formula_renames.rb
deleted file mode 100644
index bcdba63a6..000000000
--- a/Library/Homebrew/formula_renames.rb
+++ /dev/null
@@ -1,20 +0,0 @@
-FORMULA_RENAMES = {
-  "cv" => "progress",
-  "google-perftools" => "gperftools",
-  "go-app-engine-32" => "app-engine-go-32",
-  "go-app-engine-64" => "app-engine-go-64",
-  "app-engine-java-sdk" => "app-engine-java",
-  "google-app-engine" => "app-engine-python",
-  "hamsterdb" => "upscaledb",
-  "libcppa" => "caf",
-  "objective-caml" => "ocaml",
-  "mpich2" => "mpich",
-  "plt-racket" => "racket",
-  "fig" => "docker-compose",
-  "polarssl" => "mbedtls",
-  "crystal" => "autocode",
-  "nimrod" => "nim",
-  "cyassl" => "wolfssl",
-  "offline-imap" => "offlineimap",
-  "kotlin-compiler" => "kotlin",
-}
diff --git a/Library/Homebrew/tap_migrations.rb b/Library/Homebrew/tap_migrations.rb
deleted file mode 100644
index 55ed88b51..000000000
--- a/Library/Homebrew/tap_migrations.rb
+++ /dev/null
@@ -1,258 +0,0 @@
-TAP_MIGRATIONS = {
-  "adobe-air-sdk" => "homebrew/binary",
-  "afuse" => "homebrew/fuse",
-  "aimage" => "homebrew/boneyard",
-  "aplus" => "homebrew/boneyard",
-  "apple-gcc42" => "homebrew/dupes",
-  "appswitch" => "homebrew/binary",
-  "archivemount" => "homebrew/fuse",
-  "arpon" => "homebrew/boneyard",
-  "asm6" => "homebrew/boneyard",
-  "atari++" => "homebrew/x11",
-  "auctex" => "homebrew/tex",
-  "authexec" => "homebrew/boneyard",
-  "avfs" => "homebrew/fuse",
-  "aws-iam-tools" => "homebrew/boneyard",
-  "awsenv" => "Luzifer/tools",
-  "bbcp" => "homebrew/head-only",
-  "bcwipe" => "homebrew/boneyard",
-  "bindfs" => "homebrew/fuse",
-  "bochs" => "homebrew/x11",
-  "boost149" => "homebrew/versions",
-  "cantera" => "homebrew/science",
-  "cardpeek" => "homebrew/gui",
-  "catdoc" => "homebrew/boneyard",
-  "cdf" => "homebrew/boneyard",
-  "cdimgtools" => "homebrew/boneyard",
-  "celt" => "homebrew/boneyard",
-  "chktex" => "homebrew/tex",
-  "clam" => "homebrew/boneyard",
-  "clay" => "homebrew/boneyard",
-  "cloudfoundry-cli" => "pivotal/tap",
-  "clusterit" => "homebrew/x11",
-  "cmucl" => "homebrew/binary",
-  "comparepdf" => "homebrew/boneyard",
-  "coremod" => "homebrew/boneyard",
-  "curlftpfs" => "homebrew/x11",
-  "cwm" => "homebrew/x11",
-  "dart" => "dart-lang/dart",
-  "datamash" => "homebrew/science",
-  "dbslayer" => "homebrew/boneyard",
-  "ddd" => "homebrew/x11",
-  "denyhosts" => "homebrew/boneyard",
-  "dgtal" => "homebrew/science",
-  "djmount" => "homebrew/fuse",
-  "dmenu" => "homebrew/x11",
-  "dotwrp" => "homebrew/science",
-  "drizzle" => "homebrew/boneyard",
-  "drush" => "homebrew/php",
-  "dsniff" => "homebrew/boneyard",
-  "dupx" => "homebrew/boneyard",
-  "dwm" => "homebrew/x11",
-  "dzen2" => "homebrew/x11",
-  "easy-tag" => "homebrew/gui",
-  "echoping" => "homebrew/boneyard",
-  "electric-fence" => "homebrew/boneyard",
-  "encfs" => "homebrew/fuse",
-  "ext2fuse" => "homebrew/fuse",
-  "ext4fuse" => "homebrew/fuse",
-  "fceux" => "homebrew/games",
-  "feh" => "homebrew/x11",
-  "ffts" => "homebrew/boneyard",
-  "figtoipe" => "homebrew/head-only",
-  "fleet-db" => "homebrew/boneyard",
-  "fox" => "homebrew/x11",
-  "freeglut" => "homebrew/x11",
-  "freerdp" => "homebrew/x11",
-  "fsv" => "homebrew/boneyard",
-  "fuse-zip" => "homebrew/fuse",
-  "fuse4x" => "homebrew/fuse",
-  "fuse4x-kext" => "homebrew/fuse",
-  "gant" => "homebrew/boneyard",
-  "gcsfuse" => "homebrew/fuse",
-  "gdrive" => "homebrew/boneyard",
-  "geda-gaf" => "homebrew/science",
-  "geeqie" => "homebrew/gui",
-  "geomview" => "homebrew/x11",
-  "ggobi" => "homebrew/science",
-  "giblib" => "homebrew/x11",
-  "git-encrypt" => "homebrew/boneyard",
-  "git-flow-clone" => "homebrew/boneyard",
-  "git-latexdiff" => "homebrew/tex",
-  "gitfs" => "homebrew/fuse",
-  "gle" => "homebrew/x11",
-  "gnunet" => "homebrew/boneyard",
-  "gobby" => "homebrew/gui",
-  "googlecl" => "homebrew/boneyard",
-  "gpredict" => "homebrew/x11",
-  "gptfdisk" => "homebrew/boneyard",
-  "grace" => "homebrew/x11",
-  "grads" => "homebrew/binary",
-  "graylog2-server" => "homebrew/boneyard",
-  "gromacs" => "homebrew/science",
-  "gsmartcontrol" => "homebrew/gui",
-  "gtk-chtheme" => "homebrew/gui",
-  "gtkglarea" => "homebrew/boneyard",
-  "gtkwave" => "homebrew/gui",
-  "guilt" => "homebrew/boneyard",
-  "gv" => "homebrew/x11",
-  "hatari" => "homebrew/x11",
-  "helios" => "spotify/public",
-  "hexchat" => "homebrew/gui",
-  "hllib" => "homebrew/boneyard",
-  "honeyd" => "homebrew/boneyard",
-  "hugs98" => "homebrew/boneyard",
-  "hwloc" => "homebrew/science",
-  "ifuse" => "homebrew/fuse",
-  "imake" => "homebrew/x11",
-  "inkscape" => "homebrew/gui",
-  "iojs" => "homebrew/versions",
-  "ipe" => "homebrew/boneyard",
-  "ipopt" => "homebrew/science",
-  "iptux" => "homebrew/gui",
-  "itsol" => "homebrew/science",
-  "iulib" => "homebrew/boneyard",
-  "jscoverage" => "homebrew/boneyard",
-  "jsl" => "homebrew/binary",
-  "jstalk" => "homebrew/boneyard",
-  "justniffer" => "homebrew/boneyard",
-  "kbtin" => "homebrew/boneyard",
-  "kerl" => "homebrew/head-only",
-  "kernagic" => "homebrew/gui",
-  "kismet" => "homebrew/boneyard",
-  "klavaro" => "homebrew/gui",
-  "kumofs" => "homebrew/boneyard",
-  "latex-mk" => "homebrew/tex",
-  "libdlna" => "homebrew/boneyard",
-  "libgtextutils" => "homebrew/science",
-  "libodbc++" => "homebrew/boneyard",
-  "libqxt" => "homebrew/boneyard",
-  "librets" => "homebrew/boneyard",
-  "libspotify" => "homebrew/binary",
-  "lilypond" => "homebrew/tex",
-  "lmutil" => "homebrew/binary",
-  "magit" => "homebrew/emacs",
-  "meld" => "homebrew/gui",
-  "mesalib-glw" => "homebrew/x11",
-  "mess" => "homebrew/games",
-  "metalua" => "homebrew/boneyard",
-  "mit-scheme" => "homebrew/x11",
-  "mlkit" => "homebrew/boneyard",
-  "morse" => "homebrew/x11",
-  "mp3fs" => "homebrew/fuse",
-  "mpio" => "homebrew/boneyard",
-  "mscgen" => "homebrew/x11",
-  "msgpack-rpc" => "homebrew/boneyard",
-  "mupdf" => "homebrew/x11",
-  "mysql-connector-odbc" => "homebrew/boneyard",
-  "mysql-proxy" => "homebrew/boneyard",
-  "mysqlreport" => "homebrew/boneyard",
-  "net6" => "homebrew/boneyard",
-  "newick-utils" => "homebrew/science",
-  "ngrok" => "homebrew/boneyard",
-  "nlopt" => "homebrew/science",
-  "ntfs-3g" => "homebrew/fuse",
-  "octave" => "homebrew/science",
-  "opencv" => "homebrew/science",
-  "openfst" => "homebrew/science",
-  "opengrm-ngram" => "homebrew/science",
-  "ori" => "homebrew/fuse",
-  "p11-kit" => "homebrew/boneyard",
-  "pan" => "homebrew/boneyard",
-  "paq8px" => "homebrew/boneyard",
-  "par2tbb" => "homebrew/boneyard",
-  "pari" => "homebrew/x11",
-  "pathfinder" => "homebrew/boneyard",
-  "pcb" => "homebrew/science",
-  "pdf-tools" => "homebrew/emacs",
-  "pdf2image" => "homebrew/x11",
-  "pdfjam" => "homebrew/tex",
-  "pdftoipe" => "homebrew/head-only",
-  "pebble-sdk" => "pebble/pebble-sdk",
-  "pgplot" => "homebrew/x11",
-  "phash" => "homebrew/boneyard",
-  "pixie" => "homebrew/x11",
-  "pjsip" => "homebrew/boneyard",
-  "pocl" => "homebrew/science",
-  "pplatex" => "homebrew/tex",
-  "prooftree" => "homebrew/gui",
-  "pulse" => "homebrew/boneyard",
-  "pyenv-pip-rehash" => "homebrew/boneyard",
-  "pyxplot" => "homebrew/x11",
-  "qfits" => "homebrew/boneyard",
-  "qi" => "homebrew/boneyard",
-  "qiv" => "homebrew/boneyard",
-  "qrupdate" => "homebrew/science",
-  "rdesktop" => "homebrew/x11",
-  "rocket" => "homebrew/boneyard",
-  "rofs-filtered" => "homebrew/fuse",
-  "rubber" => "homebrew/tex",
-  "rxvt-unicode" => "homebrew/x11",
-  "s3-backer" => "homebrew/fuse",
-  "s3fs" => "homebrew/fuse",
-  "salt" => "homebrew/science",
-  "scantailor" => "homebrew/x11",
-  "sdelta3" => "homebrew/boneyard",
-  "sedna" => "homebrew/boneyard",
-  "shark" => "homebrew/science",
-  "shell.fm" => "homebrew/boneyard",
-  "simple-mtpfs" => "homebrew/fuse",
-  "sitecopy" => "homebrew/boneyard",
-  "slicot" => "homebrew/science",
-  "smartsim" => "homebrew/gui",
-  "solfege" => "homebrew/boneyard",
-  "sptk" => "homebrew/x11",
-  "sshfs" => "homebrew/fuse",
-  "stormfs" => "homebrew/fuse",
-  "sundials" => "homebrew/science",
-  "swi-prolog" => "homebrew/x11",
-  "sxiv" => "homebrew/x11",
-  "synfigstudio" => "homebrew/boneyard",
-  "syslog-ng" => "homebrew/boneyard",
-  "tabbed" => "homebrew/x11",
-  "telepathy-gabble" => "homebrew/boneyard",
-  "telepathy-glib" => "homebrew/boneyard",
-  "telepathy-idle" => "homebrew/boneyard",
-  "telepathy-mission-control" => "homebrew/boneyard",
-  "terminator" => "homebrew/gui",
-  "tetgen" => "homebrew/science",
-  "texmacs" => "homebrew/boneyard",
-  "texwrapper" => "homebrew/tex",
-  "threadscope" => "homebrew/gui",
-  "ticcutils" => "homebrew/science",
-  "tiger-vnc" => "homebrew/x11",
-  "timbl" => "homebrew/science",
-  "tmap" => "homebrew/boneyard",
-  "transmission-remote-gtk" => "homebrew/gui",
-  "tup" => "homebrew/fuse",
-  "uim" => "homebrew/x11",
-  "ume" => "homebrew/games",
-  "upnp-router-control" => "homebrew/gui",
-  "urweb" => "homebrew/boneyard",
-  "ushare" => "homebrew/boneyard",
-  "viewglob" => "homebrew/boneyard",
-  "vobcopy" => "homebrew/boneyard",
-  "wdfs" => "homebrew/fuse",
-  "whereami" => "homebrew/boneyard",
-  "why3" => "homebrew/tex",
-  "wkhtmltopdf" => "homebrew/boneyard",
-  "wmctrl" => "homebrew/x11",
-  "wopr" => "homebrew/science",
-  "wps2odt" => "homebrew/boneyard",
-  "x3270" => "homebrew/x11",
-  "xar" => "homebrew/dupes",
-  "xastir" => "homebrew/x11",
-  "xchat" => "homebrew/gui",
-  "xclip" => "homebrew/x11",
-  "xdotool" => "homebrew/x11",
-  "xdu" => "homebrew/x11",
-  "xmount" => "homebrew/fuse",
-  "xournal" => "homebrew/gui",
-  "xpa" => "homebrew/x11",
-  "xpdf" => "homebrew/x11",
-  "xplot" => "homebrew/x11",
-  "xspringies" => "homebrew/x11",
-  "xulrunner" => "homebrew/boneyard",
-  "yarp" => "homebrew/x11",
-  "ydict" => "homebrew/boneyard",
-}
diff --git a/Library/brew.sh b/Library/brew.sh
index 8420e3e81..db575c407 100644
--- a/Library/brew.sh
+++ b/Library/brew.sh
@@ -1,4 +1,4 @@
-HOMEBREW_VERSION="0.9.8"
+HOMEBREW_VERSION="0.9.9"
 
 odie() {
   if [[ -t 2 ]] # check whether stderr is a tty.