Commits

José Antonio Pérez Sánchez committed bb42491 Merge

fix conflict

Comments (0)

Files changed (4)

   . $TUENTI_TOOLS/env/bash_completion
   . $TUENTI_TOOLS/env/profile
 fi
+
+# add rvm if there
+if [ -d $HOME/.rvm/bin ]; then
+  export PATH=$PATH:$HOME/.rvm/bin # Add RVM to PATH for scripting
+fi
 # Which plugins would you like to load? (plugins can be found in ~/.oh-my-zsh/plugins/*)
 # Custom plugins may be added to ~/.oh-my-zsh/custom/plugins/
 # Example format: plugins=(rails git textmate ruby lighthouse)
-plugins=(git mercurial perl python battery ant ssh-agent vi-mode history-substring-search)
+plugins=(git mercurial perl python battery ant ssh-agent vi-mode history-substring-search rvm)
 case $(uname) in
   Darwin)
     plugins=($plugins osx brew iterm2 )
 if [ "$TERM" = "xterm" ]; then
   export TERM=xterm-256color
 fi
+
+# add rvm if there
+if [ -d $HOME/.rvm/scripts/rvm ]; then
+  source $HOME/.rvm/scripts/rvm
+fi
 #!/bin/bash -e
 apps_dir=$HOME/apps
 tmux_dir=$apps_dir/tmux
-tmux_url=http://sourceforge.net/projects/tmux/files/tmux/tmux-1.6/tmux-1.6.tar.gz/download
-tmux_tar=tmp/tmux-1.6.tar.gz
-tmux_build_dir=tmp/tmux-1.6
+tmux_version=1.7
+tmux_url=http://sourceforge.net/projects/tmux/files/tmux/tmux-${tmux_version}/tmux-${tmux_version}.tar.gz/download
+tmux_tar=tmp/tmux-${tmux_version}.tar.gz
+tmux_build_dir=tmp/tmux-${tmux_version}
 mkdir -p $tmux_build_dir
 
 # get helper function
 wget --quiet --timestamping https://raw.github.com/gist/3448412/dotfiles-installer.sh
 . dotfiles-installer.sh
 
+ensure_package 'make'
 ensure_package 'libncurses5-dev'
 ensure_package 'libevent-dev'
 
 #!/bin/bash -e
 apps_dir=$HOME/apps
 zsh_dir=$apps_dir/zsh
-zsh_url=http://sourceforge.net/projects/zsh/files/zsh/5.0.0/zsh-5.0.0.tar.bz2/download
-zsh_tar=tmp/zsh-5.0.0.tar.bz2
-zsh_build_dir=tmp/zsh-5.0.0
+zsh_version=5.0.0
+zsh_url=http://sourceforge.net/projects/zsh/files/zsh/${zsh_version}/zsh-${zsh_version}.tar.bz2/download
+zsh_tar=tmp/zsh-${zsh_version}.tar.bz2
+zsh_build_dir=tmp/zsh-${zsh_version}
 mkdir -p $zsh_build_dir
 
 # get helper function
 . dotfiles-installer.sh
 
 ensure_package 'libncurses5-dev'
+ensure_package 'libpcre3-dev'
 
 wget ${zsh_url} -O - | (cd tmp && tar xj)
 cd ${zsh_build_dir} \
 link_binaries $zsh_dir
 
 # install oh-my-zsh
-curl -L https://github.com/robbyrussell/oh-my-zsh/raw/master/tools/install.sh | sh
+if [ ! -d ~/.oh-my-zsh ]; then
+  git clone https://github.com/robbyrussell/oh-my-zsh.git ~/.oh-my-zsh
+fi
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.