cyplo/dotfiles
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

use rustup instead of multirust

Browse source
This commit is contained in:
Cyryl Płotnicki-Chudyk 2016-06-04 08:59:40 +02:00
parent bcaa45f2d8
commit 7a6027677a
1 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
common/configure_fresh_system
View file

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