Skip to content

Commit

Permalink
setup.shをmac os処理分岐を追加
Browse files Browse the repository at this point in the history
  • Loading branch information
cybaron committed Apr 8, 2012
1 parent 6f2fc76 commit 22bbe69
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 5 deletions.
1 change: 1 addition & 0 deletions .zshrc
Expand Up @@ -231,5 +231,6 @@ esac
## load user .zshrc configuration file ## load user .zshrc configuration file
# #
[ -f ${HOME}/.zshrc.mine ] && source ${HOME}/.zshrc.mine [ -f ${HOME}/.zshrc.mine ] && source ${HOME}/.zshrc.mine
[ -f ${HOME}/.zshrc.mac ] && source ${HOME}/.zshrc.mac
[ -f ${HOME}/.zshrc.alias ] && source ${HOME}/.zshrc.alias [ -f ${HOME}/.zshrc.alias ] && source ${HOME}/.zshrc.alias


4 changes: 4 additions & 0 deletions .zshrc.mac
@@ -0,0 +1,4 @@
export JAVA_HOME=/System/Library/Frameworks/JavaVM.framework/Versions/1.6.0/Home
export EDITOR=/Applications/MacVim.app/Contents/MacOS/Vim

alias ls="ls -G --color"
5 changes: 0 additions & 5 deletions .zshrc.mine
@@ -1,7 +1,2 @@
[[ -s "/Users/kazuki/.rvm/scripts/rvm" ]] && source "/Users/kazuki/.rvm/scripts/rvm" # This loads RVM into a shell session. [[ -s "/Users/kazuki/.rvm/scripts/rvm" ]] && source "/Users/kazuki/.rvm/scripts/rvm" # This loads RVM into a shell session.


export JAVA_HOME=/System/Library/Frameworks/JavaVM.framework/Versions/1.6.0/Home
export EDITOR=/Applications/MacVim.app/Contents/MacOS/Vim

alias ls="ls -G --color"
alias tmux="tmuxx"
5 changes: 5 additions & 0 deletions setup.sh
Expand Up @@ -7,3 +7,8 @@ do
ln -s $HOME/dotfiles/$file $HOME/$file ln -s $HOME/dotfiles/$file $HOME/$file
done done


case "${OSTYPE}" in
freebsd*|darwin*)
ln -s $HOME/dotfiles/.zshrc.mac $HOME/.zshrc.mac
;;
esac

0 comments on commit 22bbe69

Please sign in to comment.