Replace newlines with extra echo call

This commit is contained in:
Henrik Lissner 2013-03-17 02:30:13 -04:00
parent ea91aaab18
commit 7b0e02a45d
5 changed files with 47 additions and 24 deletions

View file

@ -2,14 +2,16 @@
echo "[HOMEBREW]" echo "[HOMEBREW]"
if [ ! `command -v "brew"` ]; then if [ ! `command -v "brew"` ]; then
echo "\n* Installing homebrew" echo
echo "* Installing homebrew"
# http://mxcl.github.com/homebrew/ # http://mxcl.github.com/homebrew/
ruby <(curl -fsSkL raw.github.com/mxcl/homebrew/go) ruby <(curl -fsSkL raw.github.com/mxcl/homebrew/go)
echo "\n* Setting up homebrew" echo
echo "* Setting up homebrew"
# Install GNU core utilities (those that come with OS X are outdated) # Install GNU core utilities (those that come with OS X are outdated)
brew install coreutils brew install coreutils
echo "Dont forget to add $(brew --prefix coreutils)/libexec/gnubin to \$PATH." # echo "Dont forget to add $(brew --prefix coreutils)/libexec/gnubin to \$PATH."
# Install GNU `find`, `locate`, `updatedb`, and `xargs`, g-prefixed # Install GNU `find`, `locate`, `updatedb`, and `xargs`, g-prefixed
brew install findutils brew install findutils
# Install Bash 4 # Install Bash 4
@ -37,7 +39,8 @@ if [ ! `command -v "brew"` ]; then
brew install php54-intl brew install php54-intl
brew install macvim brew install macvim
else else
echo "\n* Updating homebrew" echo
echo "* Updating homebrew"
# Make sure were using the latest Homebrew # Make sure were using the latest Homebrew
brew update brew update
@ -45,8 +48,10 @@ else
brew upgrade brew upgrade
fi fi
echo "\n* Cleaning up homebrew" echo
echo "* Cleaning up homebrew"
# Remove outdated versions from the cellar # Remove outdated versions from the cellar
brew cleanup brew cleanup
echo "\nDone!" echo
echo "Done!"

View file

@ -8,22 +8,26 @@ if [ ! `command -v "git"` ]; then
exit exit
fi fi
echo "\n* Installing git" echo
echo "* Installing git"
brew install git brew install git
fi fi
if [ ! -e /usr/local/bin/branch ]; then if [ ! -e /usr/local/bin/branch ]; then
echo "\n* Install git-friendly" echo
echo "* Install git-friendly"
# https://github.com/jamiew/git-friendly # https://github.com/jamiew/git-friendly
bash < <(curl https://raw.github.com/jamiew/git-friendly/master/install.sh) bash < <(curl https://raw.github.com/jamiew/git-friendly/master/install.sh)
fi fi
# Create links # Create links
echo "\n* Setting up symlinks" echo
echo "* Setting up symlinks"
src=$(cd "$(dirname "$0")"; pwd) src=$(cd "$(dirname "$0")"; pwd)
ln -sf $src/gitignore ~/.gitignore ln -sf $src/gitignore ~/.gitignore
ln -sf $src/gitconfig ~/.gitconfig ln -sf $src/gitconfig ~/.gitconfig
echo "\nDone!" echo
echo "Done!"

View file

@ -4,12 +4,14 @@ echo "[RVM]"
if [ ! `command -v "rvm"` ]; then if [ ! `command -v "rvm"` ]; then
# If RVM's not installed, install it and the rubies # If RVM's not installed, install it and the rubies
echo "\n* Installing RVM" echo
echo "* Installing RVM"
# https://rvm.io # https://rvm.io
curl -L https://get.rvm.io | bash -s stable --ruby curl -L https://get.rvm.io | bash -s stable --ruby
echo "\n* Install rubies" echo
echo "* Install rubies"
# Install rubies and update rubygems # Install rubies and update rubygems
rvm install 1.9.3 rvm install 1.9.3
@ -30,17 +32,20 @@ else
# Update all rubies and rubygems # Update all rubies and rubygems
for v in 1.9.3 1.8.7; do for v in 1.9.3 1.8.7; do
echo "\n* Updating ruby $v" echo
echo "* Updating ruby $v"
rvm use $v rvm use $v
gem update --system gem update --system
gem update gem update
done done
# Update system ruby # Update system ruby
echo "\n* Updating system ruby" echo
echo "* Updating system ruby"
rvm use system rvm use system
sudo gem update --system sudo gem update --system
sudo gem update sudo gem update
fi fi
echo "\nDone!" echo
echo "Done!"

View file

@ -6,12 +6,14 @@ if [ ! `command -v "brew"` ]; then
fi fi
if [ ! `command -v "mvim"` ]; then if [ ! `command -v "mvim"` ]; then
echo "\n* Installing macvim" echo
echo "* Installing macvim"
brew install macvim --with-cscope --override-system-vim brew install macvim --with-cscope --override-system-vim
fi fi
if [ ! -e ~/.vimrc ]; then if [ ! -e ~/.vimrc ]; then
echo "\n* Installing vim rcfiles" echo
echo "* Installing vim rcfiles"
if [ -d ~/.vim ]; then if [ -d ~/.vim ]; then
rm -rf ~/.vim rm -rf ~/.vim
@ -19,14 +21,17 @@ if [ ! -e ~/.vimrc ]; then
sh <(curl https://raw.github.com/hlissner/mlvim/master/install.sh -L) sh <(curl https://raw.github.com/hlissner/mlvim/master/install.sh -L)
fi fi
echo "\n* Updating vim..." echo
echo "* Updating vim..."
vim +BundleInstall! +BundleClean! +q +q vim +BundleInstall! +BundleClean! +q +q
if [ -d ~/.vim/bundle/YouCompleteMe ] && [ ! -e ~/.vim/bundle/YouCompleteMe/python/ycm_core.so ]; then if [ -d ~/.vim/bundle/YouCompleteMe ] && [ ! -e ~/.vim/bundle/YouCompleteMe/python/ycm_core.so ]; then
echo "\n* Trying to compile YCM" echo
echo "* Trying to compile YCM"
brew install cmake brew install cmake
cd ~/.vim/bundle/YouCompleteMe cd ~/.vim/bundle/YouCompleteMe
./install.sh --clang-completer ./install.sh --clang-completer
fi fi
echo "\nDone!" echo
echo "Done!"

View file

@ -4,19 +4,23 @@ echo "[ZSH]"
if [ ! -d ~/.oh-my-zsh ]; then if [ ! -d ~/.oh-my-zsh ]; then
# https://github.com/robbyrussell/oh-my-zsh # https://github.com/robbyrussell/oh-my-zsh
echo "\n* Installing oh-my-zsh" echo
echo "* Installing oh-my-zsh"
curl -L https://github.com/robbyrussell/oh-my-zsh/raw/master/tools/install.sh | sh curl -L https://github.com/robbyrussell/oh-my-zsh/raw/master/tools/install.sh | sh
# Set new shell # Set new shell
echo "\n* Changing shell" echo
echo "* Changing shell"
chsh -s /bin/zsh chsh -s /bin/zsh
fi fi
# Create links # Create links
echo "\n* Setting up symlinks" echo
echo "* Setting up symlinks"
src=$(cd "$(dirname "$0")"; pwd) src=$(cd "$(dirname "$0")"; pwd)
ln -sf $src/zshrc ~/.zshrc ln -sf $src/zshrc ~/.zshrc
ln -sf $src/zsh ~/.zsh ln -sf $src/zsh ~/.zsh
echo "\nDone!" echo
echo "Done!"