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

add NORUST option, use it under cygwin

Browse source
This commit is contained in:
Cyryl Płotnicki-Chudyk 2016-07-31 09:43:37 +02:00
parent 823d487950
commit 017e7ac5c0
2 changed files with 29 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
common/configure_fresh_system
View file

@ -76,33 +76,38 @@ fc-cache -rv
$SUDO fc-cache -rv $SUDO fc-cache -rv
set -e set -e
#rust if [[ -z $NORUST ]]; then
echo "installing rust" #rust
RUSTUP_TEMP="/tmp/blastoff.sh" echo "installing rust"
$CURL https://sh.rustup.rs > "$RUSTUP_TEMP" RUSTUP_TEMP="/tmp/blastoff.sh"
chmod a+x "$RUSTUP_TEMP" $CURL https://sh.rustup.rs > "$RUSTUP_TEMP"
"$RUSTUP_TEMP" -y chmod a+x "$RUSTUP_TEMP"
rm -f "$RUSTUP_TEMP" "$RUSTUP_TEMP" -y
rustup update rm -f "$RUSTUP_TEMP"
rustup default stable rustup update
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/local/lib rustup default stable
cd "$DIR/../" export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/local/lib
echo "getting rust sources..." cd "$DIR/../"
if [[ ! -d rust ]]; then echo "getting rust sources..."
git clone https://github.com/rust-lang/rust.git --recursive if [[ ! -d rust ]]; then
else git clone https://github.com/rust-lang/rust.git --recursive
cd rust else
git pull cd rust
git submodule update --init --recursive git pull
git submodule update --init --recursive
fi
cargo install -f rustfmt
fi fi
cargo install -f rustfmt
echo "\n" | vim +PluginInstall +qa echo "\n" | vim +PluginInstall +qa
cd "$DIR/.vim/bundle/YouCompleteMe/" cd "$DIR/.vim/bundle/YouCompleteMe/"
git submodule update --init --recursive 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 # go
export GOPATH="$HOME/go" export GOPATH="$HOME/go"

4
windows_cygwin/build.bat
View file

@ -12,6 +12,8 @@ for /f "delims=" %%A in ('%bash% "cd `cygpath $HOMEPATH`/dev/dotfiles && git rev
%bash% "mkdir -pv $HOME/dev/" %bash% "mkdir -pv $HOME/dev/"
%bash% "rm -fr $HOME/dev/dotfiles" %bash% "rm -fr $HOME/dev/dotfiles"
%bash% "git clone `cygpath $HOMEPATH`/dev/dotfiles $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% "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"