From 017e7ac5c0fdab6700018dc87462465c7aebcad7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki-Chudyk?= Date: Sun, 31 Jul 2016 09:43:37 +0200 Subject: [PATCH] add NORUST option, use it under cygwin --- common/configure_fresh_system | 47 +++++++++++++++++++---------------- windows_cygwin/build.bat | 4 ++- 2 files changed, 29 insertions(+), 22 deletions(-) diff --git a/common/configure_fresh_system b/common/configure_fresh_system index 2173da42..8fec1245 100755 --- a/common/configure_fresh_system +++ b/common/configure_fresh_system @@ -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 - git clone https://github.com/rust-lang/rust.git --recursive -else - cd rust - git pull - git submodule update --init --recursive +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 + 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" diff --git a/windows_cygwin/build.bat b/windows_cygwin/build.bat index fc81ad80..9e88f2b3 100644 --- a/windows_cygwin/build.bat +++ b/windows_cygwin/build.bat @@ -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"