Merge branch 'master' of github.com:cyplo/dotfiles

This commit is contained in:
Cyryl Płotnicki-Chudyk 2016-04-10 16:07:16 +02:00
commit 4d5e48db67
3 changed files with 5 additions and 6 deletions

@ -1 +1 @@
Subproject commit f558a460c289a41811e0c4b89f04d539c66224a1 Subproject commit 83cf8dc16f51babbb0193c5b97e568739c1f40de

@ -1 +1 @@
Subproject commit e5e5a6aa7ae70205cee3b4443f9274d3c8468c22 Subproject commit 94ec3ed902e4e55b1766232d3b0e7d602bc2c472

View file

@ -68,15 +68,13 @@ set -e
#rust #rust
echo "installing rust" echo "installing rust"
BLASTOFF_TEMP="/tmp/blastoff.sh" BLASTOFF_TEMP="/tmp/blastoff.sh"
curl -sf https://raw.githubusercontent.com/brson/multirust/master/blastoff.sh > "$BLASTOFF_TEMP" curl -sf https://raw.githubusercontent.com/brson/multirust/master/quick-install.sh > "$BLASTOFF_TEMP"
chmod a+x "$BLASTOFF_TEMP" chmod a+x "$BLASTOFF_TEMP"
"$BLASTOFF_TEMP" --yes "$BLASTOFF_TEMP" --yes
rm -f "$BLASTOFF_TEMP" rm -f "$BLASTOFF_TEMP"
multirust update multirust update
multirust default stable multirust default stable
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/local/lib export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/local/lib
cd "$DIR/.vim/bundle/racer/"
cargo build
cd "$DIR/../" cd "$DIR/../"
echo "getting rust sources..." echo "getting rust sources..."
if [[ ! -d rust ]]; then if [[ ! -d rust ]]; then
@ -94,7 +92,8 @@ source $HOME/.rvm/scripts/rvm
rvm install ruby rvm install ruby
# talks: reveal-md # talks: reveal-md
sudo npm install -g reveal-md diff-so-fancy sudo npm install -g reveal-md
sudo npm install -g diff-so-fancy
# vdir syncer # vdir syncer
echo "installing vdirsyncer" echo "installing vdirsyncer"