@@ -1,8 +1,8 @@

 # Title: .bashrc

 # Author: Frédéric CHEVALIER <f15.chevalier@gmail.com>

-# Version: 1.0

-# Created in: 2014-06-22

-# Modified in:

+# Version: 1.1

+# Created in: 2012-05-26

+# Modified in: 2014-07-02

@@ -20,8 +20,9 @@

 # Versions #

 #==========#

-# v1.0: file reorganization / aliases added

-# v0.0: creation

+# v1.1 - 2014-07-02: bug corrections in trash function and EDITOR set up / exit and diff aliases added

+# v1.0 - 2014-06-22: file reorganization / aliases added

+# v0.0 - 2012-05-26: creation

@@ -164,15 +165,15 @@ if [ -x /usr/bin/dircolors ]

 then

     test -r ~/.dircolors && eval "$(dircolors -b ~/.dircolors)" || eval "$(dircolors -b)"

-    alias ls='ls --color=auto --group-directories-first -h -C'

-    alias dir='dir --color=auto'

-    alias vdir='vdir --color=auto'

+    alias ls="ls --color=auto --group-directories-first -h -C"

+    alias dir="dir --color=auto"

+    alias vdir="vdir --color=auto"

-    alias grep='grep --color=auto'

-    alias fgrep='fgrep --color=auto'

-    alias egrep='egrep --color=auto'

+    alias grep="grep --color=auto"

+    alias fgrep="fgrep --color=auto"

+    alias egrep="egrep --color=auto"

-    alias tree='tree -C'

+    alias tree="tree -C"

 fi

@@ -181,30 +182,32 @@ fi

 # User specific aliases #

 #=======================#

+# Moving in directories

+alias ..="cd .."

+alias ....="cd ../.."

+

 # Listing files

 alias l="ls"

-alias ll="ls -l"

+alias ll="l -l"

 alias lr="l --recursive"

 alias llr="ll --recursive"

 alias la="ls -A"

 alias lla="la -l"

-# Moving in directories

-alias ..='cd ..'

-alias ....='cd ../..'

+# File manipulations

+alias diff="diff -y --suppress-common-lines"

 # Internet

 alias dl="wget -c"

-alias scp='scp -pr'

-alias ssh='ssh -Y'

-alias wf='ssh wf@vaderf.com'

-alias wf2='ssh wf2@192.168.1.65'

-alias fwf='ssh fred@vaderf.com'

-alias heron='ssh fcheval@heron.txbiomedgenetics.org'

+alias scp="scp -pr"

+alias ssh="ssh -Y"

+alias wf="ssh wf@vaderf.com"

+alias fwf="ssh fred@vaderf.com"

+alias heron="ssh fcheval@heron.txbiomedgenetics.org"

 # Disk space

-alias df='df -h'

-alias du='du -h'

+alias df="df -h"

+alias du="du -h"

 # Safety aliases

 #alias rm="rm --interactive"

@@ -214,6 +217,7 @@ alias c="cat"

 alias g="grep"

 alias h="head -15"

 alias t="tail -15"

+alias bye="exit"

 # You may want to put all your additions into a separate file like

@@ -311,20 +315,19 @@ function extract {

 # Trash function

-function trash {

-	# Check if trash-cli is installed otherwize check for already existing .trash

-	if [[ $(which trash-put) ]]

+# Check if trash-cli is installed otherwize check for already existing .trash

+if [[ $(which trash-put &> /dev/null ; echo $?) == 0 ]]

+then

+	alias trash='trash-put'

+else

+	if [[ -d $HOME/.trash/ ]]

 	then

-		alias trash='trash-put'

+		alias trash='mv $1 -t $HOME/.trash/'

 	else

-		if [[ -d $HOME/.trash/ ]]

-		then

-			alias trash='mv $1 -t $HOME/.trash/'

-		else

-			echo -e "\n\tNo trash set up: trash-cli not installed or $HOME/.trash/ does not exist.\n"

-		fi

+		echo -e "\n\tNo trash set up: trash-cli not installed or $HOME/.trash/ does not exist.\n"

 	fi

-}

+fi

+

 # Backup function

@@ -345,7 +348,7 @@ function bk {

 #================================================#

 # Editor

-if [[ $(which vim) ]]

+if [[ $(which vim &> /dev/null ; echo $?) == 0 ]]

 then

 	export EDITOR="vim"

 else

@@ -358,4 +361,4 @@ export PATH="$HOME/.local/bin:$PATH"

 # LaTeX environment

-export TEXMFHOME=$HOME/.texmf

\ No newline at end of file

+export TEXMFHOME=$HOME/.texmf