Browse files

fix bugs

  • Loading branch information...
1 parent 801979d commit 814626c7a079bd654a7a592b8cf773f4d413c9a5 @aaronjorbin committed Jan 29, 2012
Showing with 15 additions and 2 deletions.
  1. +1 −1 .vim
  2. +6 −1 bash_aliases
  3. +8 −0 install.sh
2 .vim
@@ -1 +1 @@
-Subproject commit 9e56cdd5ed3f18b74130e6880972affe9e0d9a02
+Subproject commit 1c7ae3b9c646777e41cb108f2c758f2cb38566f6
View
7 bash_aliases
@@ -2,6 +2,8 @@
##### Basic Aliases #####
#########################
alias ls='ls $LS_OPTIONS'
+alias lsa='ls -a'
+alias lsla='ls -la'
alias ll="ls -l"
alias lo="ls -o"
alias lh="ls -lh"
@@ -12,7 +14,8 @@ alias s="ls"
#alias rm="rm -i" # Make rming a slow and painful process
# Show most recent files at the bottom
alias ltr="ls -ltr"
-alias j="autojump"
+alias j="j"
+alias J="autojump"
# Why doesn't everyone have these?
alias ..="cd .."
@@ -87,3 +90,5 @@ alias gitb='git branch'
alias gsrebase='git-svn-rebase'
alias routes='netstat -nr -f inet'
+# vim should assume -p
+alias vim='vim -p'
View
8 install.sh
@@ -5,6 +5,10 @@ $CURRENTDIR = `pwd`
ln -sfnv ~/.jorbin/bashrc ~/.bashrc
source ~/.bashrc
+# get submodules
+git submodule init
+git submodule update
+
# ssh.conf
if [ -f ~/.jorbin/ssh/config ]
then
@@ -13,10 +17,14 @@ fi
# vim
if [ -d ~/.jorbin/.vim ]
+ rm -rf ~/.vim
+ rm -rf ~/.vimrc
+
then
ln -sfnv ~/.jorbin/.vim ~/.vim
ln -sfnv ~/.jorbin/.vim/vimrc ~/.vimrc
cd ~/.vim
+ mkdir tmp
git submodule init
git submodule update
cd $CURRENTDIR

0 comments on commit 814626c

Please sign in to comment.