From 515c3bb91fb525428360e1f703a15164c434a36f Mon Sep 17 00:00:00 2001 From: Matthias Kretschmann Date: Tue, 21 Jul 2015 01:23:09 +0200 Subject: [PATCH] bootstrap new machine updates --- bash_profile | 10 +++++----- bootstrap.sh | 2 +- brew.sh | 2 +- npm.sh | 4 ++-- ruby.sh | 7 +++---- 5 files changed, 12 insertions(+), 13 deletions(-) diff --git a/bash_profile b/bash_profile index aceb597..015d67f 100644 --- a/bash_profile +++ b/bash_profile @@ -13,7 +13,7 @@ # ---------------------------------------------------------------------- for file in ~/.{bash_paths,bash_prompt,exports,aliases,inputrc,private}; do - [ -r "$file" ] && [ -f "$file" ] && source "$file" + [ -r "$file" ] && [ -f "$file" ] && source "$file" done; unset file; @@ -37,14 +37,14 @@ shopt -s cdspell # * `autocd`, e.g. `**/qux` will enter `./foo/bar/baz/qux` # * Recursive globbing, e.g. `echo **/*.txt` for option in autocd globstar; do - shopt -s "$option" 2> /dev/null; + shopt -s "$option" 2> /dev/null; done; # Add tab completion for many Bash commands if which brew > /dev/null && [ -f "$(brew --prefix)/etc/bash_completion" ]; then - source "$(brew --prefix)/etc/bash_completion"; + source "$(brew --prefix)/etc/bash_completion"; elif [ -f /etc/bash_completion ]; then - source /etc/bash_completion; + source /etc/bash_completion; fi; # Add tab completion for SSH hostnames based on ~/.ssh/config, ignoring wildcards @@ -67,4 +67,4 @@ eval "$(grunt --completion=bash)" export PATH="$PATH:$HOME/.rvm/bin" # Load RVM into a shell session *as a function* -[[ -s "$HOME/.rvm/scripts/rvm" ]] && source "$HOME/.rvm/scripts/rvm" \ No newline at end of file +[[ -s "$HOME/.rvm/scripts/rvm" ]] && source "$HOME/.rvm/scripts/rvm" diff --git a/bootstrap.sh b/bootstrap.sh index 864299e..498df0b 100755 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -15,7 +15,7 @@ dir=$DOTFILES_DIR # list of files/folders to symlink in homedir -files="aliases bashrc bash_profile bash_paths bash_prompt exports gemrc gitconfig gitignore hushlogin inputrc private tm_properties generator.json npmrc bin" +files="aliases bashrc bash_profile bash_paths bash_prompt exports gemrc gitconfig gitignore hushlogin inputrc private tm_properties npmrc bin" # ---------------------------------------------------------------------- diff --git a/brew.sh b/brew.sh index 0460879..dab0e96 100755 --- a/brew.sh +++ b/brew.sh @@ -1,7 +1,7 @@ #!/bin/bash # Install Homebrew -ruby -e "$(curl -fsSL https://raw.github.com/Homebrew/homebrew/go/install)" +ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)" # Make sure we’re using the latest Homebrew brew update diff --git a/npm.sh b/npm.sh index a64df26..fb04196 100755 --- a/npm.sh +++ b/npm.sh @@ -3,9 +3,9 @@ # Installed from brewfile with node # install global stuff -npm install -g bower grunt grunt-cli gulp nib stylus +npm install -g bower grunt grunt-cli gulp nib stylus sass less # Install Keybase # https://keybase.io/docs/command_line/installation npm install -g keybase-installer -keybase-installer \ No newline at end of file +keybase-installer diff --git a/ruby.sh b/ruby.sh index 619c5ba..606492e 100755 --- a/ruby.sh +++ b/ruby.sh @@ -7,10 +7,9 @@ curl -sSL https://get.rvm.io | bash rvm requirements # Install a Ruby -rvm install 2.1.4 -rvm use --default 2.1.4 +rvm install 2.2.2 +rvm use --default 2.2.2 rvm rubygems latest # Install gems -gem install bundler -gem install jekyll \ No newline at end of file +gem install bundler jekyll