add NORUST option, use it under cygwin
This commit is contained in:
parent
823d487950
commit
017e7ac5c0
2 changed files with 29 additions and 22 deletions
|
@ -76,33 +76,38 @@ fc-cache -rv
|
|||
$SUDO fc-cache -rv
|
||||
set -e
|
||||
|
||||
#rust
|
||||
echo "installing rust"
|
||||
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..."
|
||||
if [[ ! -d rust ]]; then
|
||||
if [[ -z $NORUST ]]; then
|
||||
#rust
|
||||
echo "installing rust"
|
||||
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..."
|
||||
if [[ ! -d rust ]]; then
|
||||
git clone https://github.com/rust-lang/rust.git --recursive
|
||||
else
|
||||
else
|
||||
cd rust
|
||||
git pull
|
||||
git submodule update --init --recursive
|
||||
fi
|
||||
cargo install -f rustfmt
|
||||
fi
|
||||
|
||||
cargo install -f rustfmt
|
||||
|
||||
echo "\n" | vim +PluginInstall +qa
|
||||
|
||||
cd "$DIR/.vim/bundle/YouCompleteMe/"
|
||||
git submodule update --init --recursive
|
||||
./install.py --racer-completer --clang-completer
|
||||
if [[ -z $NORUST ]]; then
|
||||
./install.py --racer-completer --clang-completer
|
||||
else
|
||||
./install.py --clang-completer
|
||||
fi
|
||||
|
||||
# go
|
||||
export GOPATH="$HOME/go"
|
||||
|
|
|
@ -12,6 +12,8 @@ for /f "delims=" %%A in ('%bash% "cd `cygpath $HOMEPATH`/dev/dotfiles && git rev
|
|||
%bash% "mkdir -pv $HOME/dev/"
|
||||
%bash% "rm -fr $HOME/dev/dotfiles"
|
||||
%bash% "git clone `cygpath $HOMEPATH`/dev/dotfiles $HOME/dev/dotfiles"
|
||||
%bash% "cd $HOME/dev/dotfiles && git remote set-url origin git@github.com:cyplo/dotfiles.git"
|
||||
%bash% "cd $HOME/dev/dotfiles && git checkout $branch"
|
||||
%bash% "export DIR=$HOME/dev/dotfiles && export NOSUDO=true && export DONT_CHANGE_SHELL=true && bash $DIR/common/configure_fresh_system"
|
||||
%bash% "cd $HOME/dev/dotfiles && git pull"
|
||||
%bash% "DIR=$HOME/dev/dotfiles NOSUDO=true DONT_CHANGE_SHELL=true NORUST=true $DIR/common/configure_fresh_system"
|
||||
|
||||
|
|
Loading…
Reference in a new issue