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

9 files changed, 21 insertions, 304 deletions

diff --git a/.gitignore b/.gitignore
index 7e8b8a4b7..879cbdffd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -28,12 +28,22 @@
 # Ignore `share` contents (again).
 /share
 /share/doc
+/share/zsh
+/share/zsh/site-functions
 
 # Unignore our documentation.
 !/.github
 !/share/doc/homebrew
 !/share/man/man1/brew.1
 
+# Ignore `etc` contents (again)
+/etc
+/etc/bash_completion.d
+
+# Unignore our shell completion
+!/etc/bash_completion.d/brew
+!/share/zsh/site-functions/_brew
+
 # Unignore our root-level metadata files.
 !/.gitignore
 !/.travis.yml
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/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.
diff --git a/Library/Contributions/brew_bash_completion.sh b/etc/bash_completion.d/brew
index d9ad1c9cd..0a709d7f2 100644
--- a/Library/Contributions/brew_bash_completion.sh
+++ b/etc/bash_completion.d/brew
@@ -1,19 +1,4 @@
 # 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 ()
 {
diff --git a/Library/Contributions/brew_zsh_completion.zsh b/share/zsh/site-functions/_brew
index d2de5f65f..ac263f807 100644
--- a/Library/Contributions/brew_zsh_completion.zsh
+++ b/share/zsh/site-functions/_brew
@@ -2,8 +2,6 @@
 #autoload
 
 # Brew ZSH completion function
-# Drop this somewhere in your $fpath (like /usr/share/zsh/site-functions)
-# and rename it _brew
 #
 # altered from _fink