Cargo.toml

@@ -5,11 +5,11 @@ version = "0.0.0"
 
 [[bin]]
 doc = false
-name = "rust-installer"
+name = "fabricate"
 path = "src/main.rs"
 
 [dependencies]
-error-chain = "0.10.0"
+error-chain = "0.11.0"
 flate2 = "0.2.19"
 tar = "0.4.13"
 walkdir = "1.0.7"

combine-installers.sh

@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 # Copyright 2014 The Rust Project Developers. See the COPYRIGHT
 # file at the top-level directory of this distribution and at
 # http://rust-lang.org/COPYRIGHT.

gen-install-script.sh

@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 # Copyright 2014 The Rust Project Developers. See the COPYRIGHT
 # file at the top-level directory of this distribution and at
 # http://rust-lang.org/COPYRIGHT.

gen-installer.sh

@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 # Copyright 2014 The Rust Project Developers. See the COPYRIGHT
 # file at the top-level directory of this distribution and at
 # http://rust-lang.org/COPYRIGHT.

install-template.sh

@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 # Copyright 2014 The Rust Project Developers. See the COPYRIGHT
 # file at the top-level directory of this distribution and at
 # http://rust-lang.org/COPYRIGHT.
@@ -319,62 +319,6 @@ abs_path() {
     (unset CDPATH && cd "$path" > /dev/null && pwd)
 }
 
-get_host_triple() {
-    local _uname_value=$(uname -s)
-    local _ostype
-    case $_uname_value in
-
-	Linux)
-            _ostype=unknown-linux-gnu
-            ;;
-
-	FreeBSD)
-            _ostype=unknown-freebsd
-            ;;
-
-	DragonFly)
-            _ostype=unknown-dragonfly
-            ;;
-
-	Bitrig)
-            _ostype=unknown-bitrig
-            ;;
-
-	NetBSD)
-            _ostype=unknown-netbsd
-            ;;
-
-	OpenBSD)
-            _ostype=unknown-openbsd
-            ;;
-
-	Darwin)
-            _ostype=apple-darwin
-            ;;
-
-	MINGW*)
-            _ostype=pc-windows-gnu
-            ;;
-
-	MSYS*)
-            _ostype=pc-windows-gnu
-            ;;
-
-	CYGWIN*)
-            _ostype=pc-windows-gnu
-            ;;
-	Haiku)
-            _ostype=unknown-haiku
-            ;;
-
-	*)
-	    err "unknown value from uname -s: $_uname_value"
-	    ;;
-    esac
-
-    RETVAL="$_ostype"
-}
-
 uninstall_legacy() {
     local _abs_libdir="$1"
 
@@ -675,11 +619,13 @@ install_components() {
 
 		    maybe_backup_path "$_file_install_path"
 
-		    if echo "$_file" | grep "^bin/" > /dev/null
+		    if echo "$_file" | grep "^bin/" > /dev/null || test -x "$_src_dir/$_component/$_file"
 		    then
-			run install -m755 "$_src_dir/$_component/$_file" "$_file_install_path"
+			run cp "$_src_dir/$_component/$_file" "$_file_install_path"
+			run chmod 755 "$_file_install_path"
 		    else
-			run install -m644 "$_src_dir/$_component/$_file" "$_file_install_path"
+			run cp "$_src_dir/$_component/$_file" "$_file_install_path"
+			run chmod 644 "$_file_install_path"
 		    fi
 		    critical_need_ok "file creation failed"
 
@@ -719,11 +665,10 @@ install_components() {
 maybe_configure_ld() {
     local _abs_libdir="$1"
 
-    get_host_triple
-    local _ostype="$RETVAL"
+    local _ostype="$(uname -s)"
     assert_nz "$_ostype"  "ostype"
 
-    if [ "$_ostype" = "unknown-linux-gnu" -a ! -n "${CFG_DISABLE_LDCONFIG-}" ]; then
+    if [ "$_ostype" = "Linux" -a ! -n "${CFG_DISABLE_LDCONFIG-}" ]; then
 
 	# Fedora-based systems do not configure the dynamic linker to look
 	# /usr/local/lib, which is our default installation directory. To
@@ -756,11 +701,10 @@ maybe_configure_ld() {
 }
 
 maybe_unconfigure_ld() {
-    get_host_triple
-    local _ostype="$RETVAL"
+    local _ostype="$(uname -s)"
     assert_nz "$_ostype"  "ostype"
 
-    if [ "$_ostype" != "unknown-linux-gnu" ]; then
+    if [ "$_ostype" != "Linux" ]; then
 	return 0
     fi
 

src/tarballer.rs

@@ -9,8 +9,10 @@
 // except according to those terms.
 
 use std::fs::File;
-use std::io::{self, Write};
+use std::io::Write;
 use std::path::Path;
+use std::sync::Arc;
+use std::thread;
 
 use flate2;
 use flate2::write::GzEncoder;
@@ -55,15 +57,9 @@ impl Tarballer {
             .chain_err(|| "failed to collect file paths")?;
         files.sort_by(|a, b| a.bytes().rev().cmp(b.bytes().rev()));
 
-        // Prepare the .tar.gz file
-        let gz = GzEncoder::new(create_new_file(tar_gz)?, flate2::Compression::Best);
-
-        // Prepare the .tar.xz file
-        let xz = XzEncoder::new(create_new_file(tar_xz)?, 9);
-
         // Write the tar into both encoded files.  We write all directories
         // first, so files may be directly created. (see rustup.rs#1092)
-        let mut builder = Builder::new(Tee(gz, xz));
+        let mut builder = Builder::new(Vec::new());
         for path in dirs {
             let src = Path::new(&self.work_dir).join(&path);
             builder.append_dir(&path, &src)
@@ -75,12 +71,25 @@ impl Tarballer {
             builder.append_data(&mut header(&src, &file)?, &path, &file)
                 .chain_err(|| format!("failed to tar file '{}'", src.display()))?;
         }
-        let Tee(gz, xz) = builder.into_inner()
+        let contents = builder.into_inner()
             .chain_err(|| "failed to finish writing .tar stream")?;
+        let contents = Arc::new(contents);
+
+        // Prepare the .tar.gz file
+        let contents2 = contents.clone();
+        let t = thread::spawn(move || {
+            let mut gz = GzEncoder::new(create_new_file(tar_gz)?,
+                                        flate2::Compression::Best);
+            gz.write_all(&contents2).chain_err(|| "failed to write .gz")?;
+            gz.finish().chain_err(|| "failed to finish .gz")
+        });
+
+        // Prepare the .tar.xz file
+        let mut xz = XzEncoder::new(create_new_file(tar_xz)?, 9);
+        xz.write_all(&contents).chain_err(|| "failed to write .xz")?;
+        xz.finish().chain_err(|| "failed to finish .xz")?;
 
-        // Finish both encoded files
-        gz.finish().chain_err(|| "failed to finish .tar.gz file")?;
-        xz.finish().chain_err(|| "failed to finish .tar.xz file")?;
+        t.join().unwrap()?;
 
         Ok(())
     }
@@ -129,17 +138,3 @@ fn get_recursive_paths<P, Q>(root: P, name: Q) -> Result<(Vec<String>, Vec<Strin
     }
     Ok((dirs, files))
 }
-
-struct Tee<A, B>(A, B);
-
-impl<A: Write, B: Write> Write for Tee<A, B> {
-    fn write(&mut self, buf: &[u8]) -> io::Result<usize> {
-        self.0.write_all(buf)
-            .and(self.1.write_all(buf))
-            .and(Ok(buf.len()))
-    }
-
-    fn flush(&mut self) -> io::Result<()> {
-        self.0.flush().and(self.1.flush())
-    }
-}

test.sh

@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 set -e -u