Merge branch 'master' of github.com:lewagon/dotfiles

# Conflicts: # Preferences.sublime-settings
J-B-G · Dec 1, 2017 · 695e249 · 695e249
2 parents 8f2b5a9 + f54517e
commit 695e249
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/install.sh b/install.sh
@@ -12,7 +12,7 @@ backup() {
 for name in *; do
   if [ ! -d "$name" ]; then
     target="$HOME/.$name"
-    if [[ ! "$name" =~ '\.sh$' ]] && [ "$name" != 'README.md' ]; then
+    if [[ ! "$name" =~ '\.sh$' ]] && [ "$name" != 'README.md' ] && [[ ! "$name" =~ '\.sublime-settings$' ]]; then
       backup $target
 
       if [ ! -e "$target" ]; then

diff --git a/zshrc b/zshrc
@@ -15,7 +15,7 @@ source "${ZSH}/oh-my-zsh.sh"
 unalias rm # No interactive rm by default (brought by plugins/common-aliases)
 
 # Load rbenv if installed
-export PATH="~/.rbenv/bin:${PATH}"
+export PATH="${HOME}/.rbenv/bin:${PATH}"
 type -a rbenv > /dev/null && eval "$(rbenv init -)"
 
 # Rails and Ruby uses the local `bin` folder to store binstubs.