V2

Author: brson

.gitignore

@@ -1 +1,2 @@
-*~
+*~
+tmp

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "test/rust-installer-v1"]
+	path = test/rust-installer-v1
+	url = https://github.com/rust-lang/rust-installer

.travis.yml

@@ -0,0 +1,2 @@
+script:
+  - ./test.sh

README.md

@@ -1,3 +1,5 @@
+[![Build Status](https://travis-ci.org/rust-lang/rust-installer.svg?branch=master)](https://travis-ci.org/rust-lang/rust-installer)
+
 A generator for the install.sh script commonly used to install Rust in
 Unix environments. It is used By Rust, Cargo, and is intended to be
 used by a future combined installer of Rust + Cargo.
@@ -12,8 +14,11 @@ used by a future combined installer of Rust + Cargo.
                    --image-dir=./install-image \
                    --work-dir=./temp \
                    --output-dir=./dist \
-                   --non-installed-prefixes="foo,bin/bar,lib/baz" \
-                   --package-name=rustc-nightly-i686-apple-darwin
+                   --non-installed-prefixes=foo,bin/bar,lib/baz \
+                   --package-name=rustc-nightly-i686-apple-darwin \
+                   --component-name=rustc \
+                   --legacy-manifest-dirs=rustlib \
+                   --bulk-dirs=share/doc
 ```
 
 Or, to just generate the script.
@@ -23,8 +28,24 @@ Or, to just generate the script.
                         --verify-bin=rustc \
                         --rel-manifest-dir=rustlib \
                         --success-message=Rust-is-ready-to-roll. \
-                        --output-script=install.sh
+                        --output-script=install.sh \
+                        --legacy-manifest-dirs=rustlib
 ```
 
 *Note: the dashes in `success-message` are converted to spaces. The
-script's argument handling is broken with spaces.*
+script's argument handling is broken with spaces.*
+
+To combine installers.
+
+```
+./combine-installers.sh --product-name=Rust \
+                        --verify-bin=rustc \
+                        --rel-manifest-dir=rustlib \
+                        --success-message=Rust-is-ready-to-roll. \
+                        --work-dir=./temp \
+                        --output-dir=./dist \
+                        --non-installed-overlay=./overlay \
+                        --package-name=rustc-nightly-i686-apple-darwin \
+                        --legacy-manifest-dirs=rustlib \
+                        --input-tarballs=./rustc.tar.gz,cargo.tar.gz
+```