From 818e687790ecca69102268f17c5798acae2d7ee0 Mon Sep 17 00:00:00 2001
From: Antono Vasiljev <antono.vasiljev@gmail.com>
Date: Fri, 12 Aug 2011 04:07:12 +0300
Subject: [PATCH 1/3] Detect OS in emacs.aliases.bash

---
 aliases/available/emacs.aliases.bash | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/aliases/available/emacs.aliases.bash b/aliases/available/emacs.aliases.bash
index 5b328768..5042b17e 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

From 89da5f9ceccc5667ff4d946d25d4d4a5b2b98698 Mon Sep 17 00:00:00 2001
From: Antono Vasiljev <antono.vasiljev@gmail.com>
Date: Fri, 12 Aug 2011 04:08:11 +0300
Subject: [PATCH 2/3] general.aliases.bash: use native tree if [ -x ] ....

---
 aliases/available/general.aliases.bash | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/aliases/available/general.aliases.bash b/aliases/available/general.aliases.bash
index 74f54280..457d6b5b 100644
--- a/aliases/available/general.aliases.bash
+++ b/aliases/available/general.aliases.bash
@@ -37,15 +37,19 @@ alias rb="ruby"
 
 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'

From 380a4a6c0e482a6f8f139d3cc8fc3daa8023f63a Mon Sep 17 00:00:00 2001
From: Antono Vasiljev <antono.vasiljev@gmail.com>
Date: Fri, 12 Aug 2011 04:12:07 +0300
Subject: [PATCH 3/3] Alias for textmate only on darwin*

---
 aliases/available/textmate.aliases.bash | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/aliases/available/textmate.aliases.bash b/aliases/available/textmate.aliases.bash
index ecd616ff..4e696a55 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