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

 # Title: .bashrc

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

-# Version: 1.9

+# Version: 1.10

 # Created in: 2012-05-26

-# Modified in: 2014-10-18

+# Modified in: 2015-04-19

@@ -19,6 +19,7 @@

 # Versions #

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

+# v.1.10 - 2015-04-19: one archive format added to the extract function / less behaviour improved / alias updated

 # v1.9 - 2014-10-18: value of TERM variable determined by case statement => this fix 256 color terminal problem / improvement of color capability detection / alias added

 # v1.8 - 2014-10-14: HISTIGNORE correction and adding / start_agent function output improved

 # v1.7 - 2014-09-25: start_agent function improved

@@ -62,7 +63,7 @@ export HISTCONTROL=ignoreboth

 # Ignore some controlling instructions

 # The '&' is a special pattern which suppresses duplicate entries.

-export HISTIGNORE=$'[ \t]*:&:[fb]g:l[slar]:l:ll[ar]:exit:q:?q:s:ns:screen*'

+export HISTIGNORE=$'[ \t]*:&:[fb]g:l[slar]:l:ll[ar]:exit:q:?q:s:ns:screen -X*'

 # Whenever displaying the prompt, write the previous line to disk

 #export PROMPT_COMMAND="history -a"

@@ -170,13 +171,11 @@ then

     export LESS_TERMCAP_us=$'\e[01;35m'    # underlined start (if white bg: $'\e[01;32m')

 fi

-unset color_prompt

-

 # Enable color support of ls and grep and also add handy aliases

-if [[ -x /usr/bin/dircolors ]]

+if [[ -x /usr/bin/dircolors && "$color_prompt" == "yes" ]]

 then

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

+    [[ -r ~/.dircolors ]] && eval "$(dircolors -b ~/.dircolors)" || eval "$(dircolors -b)"

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

     alias dir="dir --color=auto"

@@ -209,15 +208,14 @@ alias lla="la -l"

 # File manipulations

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

-alias less="less -R"

 # Internet

 alias dl="wget -c"

 alias scp="scp -pr"

 alias ssh="myssh -Y"

-alias wf="ssh -i $HOME/.ssh/id_main-server.dsa wf@vaderf.com"

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

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

+alias wf="ssh wf"

+alias fwf="ssh fwf"

+alias heron="ssh heron"

 # Disk space

 alias df="df -h"

@@ -314,17 +312,18 @@ alias cd=cd_func

 # Extract function

 function extract {

-	if [[ -f $1 ]]

+	if [[ -f "$1" ]]

 	then

 		case $1 in

-			*.tar.bz2 | *.tbz2	) tar xvjf $1 ;;

-			*.tar.gz | *.tgz	) tar xvzf $1 ;;

-			*.tar				) tar xvf $1 ;;

-			*.gz				) gunzip $1 ;;

-			*.bz2				) bunzip2 $1 ;;

-			*.rar				) rar x $1 ;;

-			*.zip | *.7z		) unzip $1 ;;

-			*.Z					) uncompress $1 ;;

+			*.tar.bz2 | *.tbz2	) tar xvjf "$1" ;;

+			*.tar.gz | *.tgz	) tar xvzf "$1" ;;

+			*.tar				) tar xvf "$1" ;;

+			*.gz				) gunzip "$1" ;;

+			*.bz2				) bunzip2 "$1" ;;

+			*.rar				) rar x "$1" ;;

+            *.xz                ) tar xvJf "$1" ;;

+			*.zip | *.7z		) unzip "$1" ;;

+			*.Z					) uncompress "$1" ;;

 			*					) echo "don't know how to extract '$1'..." ;;

 		esac

 	else

@@ -378,12 +377,13 @@ function start_agent {

     # SSH agent environment

     echo -e "\n${msg1}"

     ssh-agent | sed 's/^echo/#echo/' > "${SSH_ENV}"

-    echo -e "${msg2}\n\n"

+    echo -e "${msg2}\n"

     chmod 600 "${SSH_ENV}"

     source "${SSH_ENV}" > /dev/null

     # SSH key add ($@: useful to add ssh-add options like lifetime directly through start_agent)

     ssh-add $@ 

+    echo ""

 }

@@ -417,3 +417,39 @@ export R_HISTSIZE=$HISTSIZE

 # SSH environment

 export SSH_ENV="$HOME/.ssh/ssh_agent_$HOSTNAME"

+

+# LESS environment

+if [[ "$color_prompt" == yes ]]

+then

+    export LESS="-RM "

+

+    # Pretty less function

+    function pless {

+        # Pygmentize version

+        #pygmentize -f 256 -P style=friendly $@ | less -R

+

+        # Vim version

+        /usr/share/vim/vim$(vim --version | grep -o -m 1 "[[:digit:]]\.[[:digit:]]" | sed "s/\.//g")/macros/less.sh "$@"

+    }

+

+    # Dependency: lesspipe.sh

+    ## source: http://www-zeuthen.desy.de/~friebel/unix/lesspipe.html

+    if [[ -x $(which lesspipe.sh 2> /dev/null) ]]

+    then

+        unset LESSOPEN

+        #eval "$(SHELL=/bin/sh lesspipe.sh)"

+        export LESSOPEN="| lesspipe.sh %s 2> /dev/null" # Avoid pigmentize message when lexer not found

+

+        if [[ -x $(which pygmentize 2> /dev/null) ]]

+        then

+            export LESSCOLORIZER="pygmentize"

+        elif [[ -x $(which code2color 2> /dev/null) ]]

+        then

+            export LESSCOLORIZER="code2color"

+        fi

+    fi

+fi

+

+

+# Unset variables previously created

+unset color_prompt