From 7a6027677ab09aff68648aea712385fac233bbe8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cyryl=20P=C5=82otnicki-Chudyk?= <cyplo@cyplo.net>
Date: Sat, 4 Jun 2016 08:59:40 +0200
Subject: [PATCH] use rustup instead of multirust

---
 common/configure_fresh_system | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/common/configure_fresh_system b/common/configure_fresh_system
index fcfbf8f9..ab412142 100755
--- a/common/configure_fresh_system
+++ b/common/configure_fresh_system
@@ -11,6 +11,8 @@ if [[ -z $DONT_CHANGE_SHELL ]]; then
     chsh -s `which zsh` $USER 
 fi
 
+CURL="curl -sSf"
+
 #submodules
 DIR=`realpath $DIR`
 echo "using $DIR as the top level directory"
@@ -66,13 +68,13 @@ set -e
 
 #rust
 echo "installing rust"
-BLASTOFF_TEMP="/tmp/blastoff.sh"
-curl -sf https://raw.githubusercontent.com/brson/multirust/master/quick-install.sh > "$BLASTOFF_TEMP"
-chmod a+x "$BLASTOFF_TEMP"
-"$BLASTOFF_TEMP" --yes
-rm -f "$BLASTOFF_TEMP"
-multirust update
-multirust default stable
+RUSTUP_TEMP="/tmp/blastoff.sh"
+$CURL https://sh.rustup.rs > "$RUSTUP_TEMP"
+chmod a+x "$RUSTUP_TEMP"
+"$RUSTUP_TEMP" -y
+rm -f "$RUSTUP_TEMP"
+rustup update
+rustup default stable
 export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/local/lib
 cd "$DIR/../"
 echo "getting rust sources..."
@@ -92,7 +94,7 @@ set -e
 
 # rvm
 gpg2 --keyserver hkp://keys.gnupg.net --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3
-curl -sSL https://get.rvm.io | bash -s stable
+$CURL https://get.rvm.io | bash -s stable
 source $HOME/.rvm/scripts/rvm
 rvm install ruby