From b9cc9a53468b1ccb7dd10af1c6a772f44a042f29 Mon Sep 17 00:00:00 2001
From: Pirmin Kalberer <pka@sourcepole.ch>
Date: Mon, 12 Mar 2018 22:02:32 +0100
Subject: [PATCH] Use rustup for Rust installation

---
 rust/install.sh | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/rust/install.sh b/rust/install.sh
index 4cd4302..c9310fe 100644
--- a/rust/install.sh
+++ b/rust/install.sh
@@ -3,18 +3,11 @@
 # exit if a command fails
 set -e
 
-triple=x86_64-unknown-linux-gnu
-
 # install curl (needed to install rust)
 apt-get update && apt-get install -y curl gdb g++-multilib lib32stdc++6 libssl-dev libncurses5-dev
 
-# install rust
-curl -sL https://static.rust-lang.org/dist/rust-nightly-$triple.tar.gz | tar xvz -C /tmp
-/tmp/rust-nightly-$triple/install.sh
-
-# install cargo
-curl -sL https://static.rust-lang.org/cargo-dist/cargo-nightly-$triple.tar.gz | tar xvz -C /tmp
-/tmp/cargo-nightly-$triple/install.sh
+# install rust + cargo nightly
+curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain nightly
 
 # cleanup package manager
 apt-get remove --purge -y curl && apt-get autoclean && apt-get clean