Merge pull request #76 from antono/master
Be more clever about OS...
diff --git a/aliases/available/emacs.aliases.bash b/aliases/available/emacs.aliases.bash
index 5b32876..5042b17 100644
--- a/aliases/available/emacs.aliases.bash
+++ b/aliases/available/emacs.aliases.bash
@@ -1,3 +1,11 @@
#!/bin/bash
-alias em="open -a emacs"
\ No newline at end of file
+case $OSTYPE in
+ linux*)
+ alias em='emacs'
+ alias e='emacsclient -n'
+ ;;
+ darwin*)
+ alias em="open -a emacs"
+ ;;
+esac
diff --git a/aliases/available/general.aliases.bash b/aliases/available/general.aliases.bash
index 74f5428..457d6b5 100644
--- a/aliases/available/general.aliases.bash
+++ b/aliases/available/general.aliases.bash
@@ -37,15 +37,19 @@
alias piano="pianobar"
-alias ..='cd ..' # Go up one directory
-alias ...='cd ../..' # Go up two directories
-alias -- -="cd -" # Go back
+alias ..='cd ..' # Go up one directory
+alias ...='cd ../..' # Go up two directories
+alias ....='cd ../../..' # Go up two directories
+alias -- -="cd -" # Go back
# Shell History
alias h='history'
# Tree
-alias tree="find . -print | sed -e 's;[^/]*/;|____;g;s;____|; |;g'"
+if [ ! -x "$(which tree)" ]
+then
+ alias tree="find . -print | sed -e 's;[^/]*/;|____;g;s;____|; |;g'"
+fi
# Directory
alias md='mkdir -p'
diff --git a/aliases/available/textmate.aliases.bash b/aliases/available/textmate.aliases.bash
index ecd616f..4e696a5 100644
--- a/aliases/available/textmate.aliases.bash
+++ b/aliases/available/textmate.aliases.bash
@@ -1,5 +1,9 @@
#!/bin/bash
-# Textmate
-alias e='mate . &'
-alias et='mate app config db lib public script test spec config.ru Gemfile Rakefile README &'
\ No newline at end of file
+case $OSTYPE in
+ darwin*)
+ # Textmate
+ alias e='mate . &'
+ alias et='mate app config db lib public script test spec config.ru Gemfile Rakefile README &'
+ ;;
+esac