Mention in readme which subdirs were merged per plugin

2 files changed, 70 insertions, 63 deletions

diff --git a/README.md b/README.md
index bddc73e8..82370903 100644
--- a/README.md
+++ b/README.md
@@ -19,47 +19,47 @@ Optionally download one of the [releases](https://github.com/sheerun/vim-polyglo
 
 ## Language packs
 
-- [arduino](https://github.com/sudar/vim-arduino-syntax)
-- [bundler](https://github.com/tpope/vim-bundler)
-- [c++11](https://github.com/octol/vim-cpp-enhanced-highlight)
-- [c/c++](https://github.com/vim-jp/cpp-vim)
-- [clojure](https://github.com/guns/vim-clojure-static)
-- [coffee-script](https://github.com/kchmck/vim-coffee-script)
-- [css-color](https://github.com/ap/vim-css-color)
-- [csv](https://github.com/chrisbra/csv.vim)
-- [cucumber](https://github.com/tpope/vim-cucumber)
-- [elixir](https://github.com/elixir-lang/vim-elixir)
-- [erlang](https://github.com/jimenezrick/vimerl)
-- [git](https://github.com/tpope/vim-git)
-- [go](https://github.com/jnwhiteh/vim-golang)
-- [haml](https://github.com/tpope/vim-haml)
-- [handlebars](https://github.com/nono/vim-handlebars)
-- [haskell](https://github.com/travitch/hasksyn)
-- [html5](https://github.com/othree/html5.vim)
-- [javascript](https://github.com/pangloss/vim-javascript)
-- [json](https://github.com/leshill/vim-json)
-- [jst](https://github.com/briancollins/vim-jst)
-- [latex](https://github.com/jcf/vim-latex)
-- [less](https://github.com/groenewege/vim-less)
-- [markdown](https://github.com/tpope/vim-markdown)
-- [nginx](https://github.com/mutewinter/nginx.vim)
-- [ocaml](https://github.com/jrk/vim-ocaml)
-- [octave](https://github.com/vim-scripts/octave.vim--)
-- [php](https://github.com/spf13/PIV)
-- [puppet](https://github.com/ajf/puppet-vim)
-- [python](https://github.com/vim-scripts/python.vim--Vasiliev)
-- [rspec](https://github.com/skwp/vim-rspec)
-- [ruby](https://github.com/vim-ruby/vim-ruby)
-- [sbt](https://github.com/derekwyatt/vim-sbt)
-- [scala](https://github.com/derekwyatt/vim-scala)
-- [slim](https://github.com/slim-template/vim-slim)
-- [stylus](https://github.com/wavded/vim-stylus)
-- [textile](https://github.com/timcharper/textile.vim)
-- [tmux](https://github.com/acustodioo/vim-tmux)
-- [tomdoc](https://github.com/mutewinter/tomdoc.vim)
-- [vbnet](https://github.com/vim-scripts/vbnet.vim)
-- [twig](https://github.com/beyondwords/vim-twig)
-- [xls](https://github.com/vim-scripts/XSLT-syntax)
+- [arduino](https://github.com/sudar/vim-arduino-syntax) (syntax, ftdetect)
+- [bundler](https://github.com/tpope/vim-bundler) (compiler)
+- [c++11](https://github.com/octol/vim-cpp-enhanced-highlight) (syntax)
+- [c/c++](https://github.com/vim-jp/cpp-vim) (syntax)
+- [clojure](https://github.com/guns/vim-clojure-static) (syntax, indent, autoload, ftplugin, ftdetect)
+- [coffee-script](https://github.com/kchmck/vim-coffee-script) (syntax, indent, compiler, autoload, ftplugin, ftdetect)
+- [css-color](https://github.com/ap/vim-css-color) (syntax)
+- [csv](https://github.com/chrisbra/csv.vim) (syntax, ftplugin, ftdetect)
+- [cucumber](https://github.com/tpope/vim-cucumber) (syntax, indent, compiler, ftplugin, ftdetect)
+- [elixir](https://github.com/elixir-lang/vim-elixir) (syntax, indent, compiler, ftplugin, ftdetect)
+- [erlang](https://github.com/jimenezrick/vimerl) (syntax, indent, compiler, autoload, ftplugin)
+- [git](https://github.com/tpope/vim-git) (syntax, indent, ftplugin, ftdetect)
+- [go](https://github.com/jnwhiteh/vim-golang) (syntax, indent, autoload, ftplugin, ftdetect)
+- [haml](https://github.com/tpope/vim-haml) (syntax, indent, compiler, ftplugin, ftdetect)
+- [handlebars](https://github.com/nono/vim-handlebars) (syntax, ftplugin, ftdetect)
+- [haskell](https://github.com/travitch/hasksyn) (syntax, indent, ftplugin)
+- [html5](https://github.com/othree/html5.vim) (syntax, indent, autoload)
+- [javascript](https://github.com/pangloss/vim-javascript) (syntax, indent, ftdetect)
+- [json](https://github.com/leshill/vim-json) (syntax, ftdetect)
+- [jst](https://github.com/briancollins/vim-jst) (syntax, indent, ftdetect)
+- [latex](https://github.com/jcf/vim-latex) (indent, compiler, ftplugin)
+- [less](https://github.com/groenewege/vim-less) (syntax, indent, ftplugin, ftdetect)
+- [markdown](https://github.com/tpope/vim-markdown) (syntax, ftplugin, ftdetect)
+- [nginx](https://github.com/mutewinter/nginx.vim) (syntax, ftdetect)
+- [ocaml](https://github.com/jrk/vim-ocaml) (syntax, indent, ftplugin)
+- [octave](https://github.com/vim-scripts/octave.vim--) (syntax)
+- [php](https://github.com/spf13/PIV) (syntax, indent, autoload, ftplugin)
+- [puppet](https://github.com/ajf/puppet-vim) (syntax, indent, ftplugin, ftdetect)
+- [python](https://github.com/vim-scripts/python.vim--Vasiliev) (syntax)
+- [rspec](https://github.com/skwp/vim-rspec) (syntax)
+- [ruby](https://github.com/vim-ruby/vim-ruby) (syntax, indent, compiler, autoload, ftplugin, ftdetect)
+- [sbt](https://github.com/derekwyatt/vim-sbt) (syntax, ftdetect)
+- [scala](https://github.com/derekwyatt/vim-scala) (syntax, indent, ftplugin, ftdetect)
+- [slim](https://github.com/slim-template/vim-slim) (syntax, indent, ftdetect)
+- [stylus](https://github.com/wavded/vim-stylus) (syntax, indent, ftplugin, ftdetect)
+- [textile](https://github.com/timcharper/textile.vim) (syntax, ftplugin, ftdetect)
+- [tmux](https://github.com/acustodioo/vim-tmux) (syntax, ftdetect)
+- [tomdoc](https://github.com/mutewinter/tomdoc.vim) (syntax)
+- [vbnet](https://github.com/vim-scripts/vbnet.vim) (syntax)
+- [twig](https://github.com/beyondwords/vim-twig) (syntax, ftplugin, ftdetect)
+- [xls](https://github.com/vim-scripts/XSLT-syntax) (syntax)
 
 ## Contributing
 
diff --git a/build b/build
index bf1ab93f..84394215 100755
--- a/build
+++ b/build
@@ -2,45 +2,51 @@
 
 set -E
 
-DIRS="
-  syntax indent ftplugin ftdetect autoload compiler
-  after/syntax after/indent after/ftplugin after/ftdetect
-"
-
-copy_dir() {
-  if [ -d "$1/$2" ]; then
-    for file in $(find "$1/$2" -name '*.vim'); do
-      file_path="$(dirname "${file##$1/}")"
-      mkdir -p "$file_path"
-      cp $file $file_path/
-    done
-  fi
-}
+DIRS="syntax indent compiler autoload ftplugin ftdetect after/syntax after/indent after/ftplugin after/ftdetect"
 
 # Fetches syntax files from given Github repo
 
 download() {
   for pack in $1; do
-    name="$(echo $pack | cut -d ':' -f 1)"
-    path="$(echo $pack | cut -d ':' -f 2)"
-    dir="tmp/$(echo "$path" | cut -d '/' -f 2)"
-    echo "- [$name](https://github.com/$path)"
+    path="$(printf "$pack" | cut -d ':' -f 2)"
+    dir="tmp/$(printf "$path" | cut -d '/' -f 2)"
     rm -rf "$dir"
-    git clone -q --recursive "https://github.com/$path.git" "$dir" &
+    (git clone -q --recursive "https://github.com/$path.git" "$dir" && printf '.') &
   done
 
   wait
 }
 
 extract() {
+  printf "\n"
   for pack in $1; do
-    path="$(echo $pack | cut -d ':' -f 2)"
-    dir="tmp/$(echo "$path" | cut -d '/' -f 2)"
+    name="$(printf "$pack" | cut -d ':' -f 1)"
+    path="$(printf "$pack" | cut -d ':' -f 2)"
+    dir="tmp/$(printf "$path" | cut -d '/' -f 2)"
+    printf -- "- [$name](https://github.com/$path) ("
 
     # which tree > /dev/null && tree tmp
+    subdirs=""
     for subdir in $DIRS; do
-      copy_dir "$dir" "$subdir"
+      if [ -d "$dir/$subdir" ]; then
+        base="$(basename "$subdir")"
+        if [[ "$subdirs" != *"$base"* ]]; then
+          subdirs="$subdirs, $base"
+        fi
+
+        copy_dir "$dir" "$subdir"
+      fi
     done
+
+    printf "${subdirs##, })\n"
+  done
+}
+
+copy_dir() {
+  for file in $(find "$1/$2" -name '*.vim'); do
+    file_path="$(dirname "${file##$1/}")"
+    mkdir -p "$file_path"
+    cp $file $file_path/
   done
 }
 
@@ -92,6 +98,7 @@ PACKS="
   xls:vim-scripts/XSLT-syntax
 "
 
+printf "Downloading packs..."
 download "$PACKS"
 extract "$PACKS"