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

 # Title: .bashrc

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

-# Version: 1.13

+# Version: 1.14

 # Created in: 2012-05-26

-# Modified in: 2016-08-14

+# Modified in: 2016-10-06

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

 # Versions #

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

+# v1.14 - 2016-10-06: ls aliases improved to not display quote around names with spaces / terminal title functions added

 # v1.13 - 2016-08-14: command history automatically appended / HISTSIZE increased / ssh alias without -Y for improving security / trash function improved

 # v1.12 - 2016-01-01: PS1 updated / extract function updated

 # v1.11 - 2015-08-17: sty-updater function added

@@ -207,11 +208,11 @@ alias ..="cd .."

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

 # Listing files

-alias l="ls"

+alias l="ls -N"

 alias ll="l -l"

 alias lr="l --recursive"

 alias llr="ll --recursive"

-alias la="ls -A"

+alias la="ls -AN"

 alias lla="la -l"

 # File manipulations

@@ -412,7 +413,21 @@ function sty-updater {

         # Info message

         echo -e "The STY value has been updated:\n\t- old value: $old_sty\n\t- new value: $STY"

     fi

-}   

+}

+

+

+# Terminal title definition

+## Specific terminal title

+function termtitle() {

+    PS1=$(echo "$PS1" | sed "s,\\\\\[\\\e\\]0;.*\\\a\\\],,")   # Remove previous title present in the prompt if any

+    echo -ne "\e]0;$1\a"

+}

+

+## Terminal title from path

+function termtitlepath() {

+    TTY=$(tty)

+    PS1="\[\e]0;\h - ${TTY#/dev/}  |  \w\a\]$PS1"

+}

@@ -420,6 +435,10 @@ function sty-updater {

 # User specific environment and startup programs #

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

+# Set default terminal title

+termtitlepath

+

+

 # Editor

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

 then

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

 # Title: .bashrc

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

-# Version: 1.12

+# Version: 1.13

 # Created in: 2012-05-26

-# Modified in: 2016-01-01

+# Modified in: 2016-08-14

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

 # Versions #

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

+# v1.13 - 2016-08-14: command history automatically appended / HISTSIZE increased / ssh alias without -Y for improving security / trash function improved

 # v1.12 - 2016-01-01: PS1 updated / extract function updated

 # v1.11 - 2015-08-17: sty-updater function added

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

@@ -68,10 +69,10 @@ export HISTCONTROL=ignoreboth

 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"

+export PROMPT_COMMAND="history -a"

 # Maximum command retain in the .bash_history file

-export HISTSIZE=2000

+export HISTSIZE=50000

 # Add timestamps for each command

 export HISTTIMEFORMAT="$(echo -e '\e[0;32m')[ %d/%m/%Y %H:%M:%S ] $(echo -e '\e[0m') "

@@ -109,7 +110,7 @@ shopt -s autocd

 # source: http://stackoverflow.com/questions/6787734/strange-behavior-of-vim-color-inside-screen-with-256-colors

 case "$TERM" in

     *-256color)

-        alias myssh="TERM=${TERM%-256color} ssh"

+        alias ssh="TERM=${TERM%-256color} ssh"

         ;;

     *)

         POTENTIAL_TERM=${TERM}-256color

@@ -124,7 +125,6 @@ case "$TERM" in

 #           export TERM=$POTENTIAL_TERM

         fi

-        alias myssh="ssh"

         ;;

 esac

@@ -220,7 +220,6 @@ alias diff="diff -y --suppress-common-lines"

 # Internet

 alias dl="wget -c"

 alias scp="scp -pr"

-alias ssh="myssh -Y"

 alias wf="ssh wf"

 alias fwf="ssh fwf"

 alias heron="ssh heron"

@@ -349,7 +348,7 @@ then

 else

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

 	then

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

+		alias trash='mv -f --backup=numbered -t $HOME/.trash/ $@'

 	else

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

 	fi

@@ -409,11 +408,11 @@ function sty-updater {

         # Update STY with the new value

         export STY=$(screen -list | sed "s/^\t//g" | grep $(echo $STY | cut -d "." -f 1) | cut -f 1)

-

+        

         # Info message

         echo -e "The STY value has been updated:\n\t- old value: $old_sty\n\t- new value: $STY"

     fi

-}

+}   

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

 # Title: .bashrc

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

-# Version: 1.11

+# Version: 1.12

 # Created in: 2012-05-26

-# Modified in: 2015-08-17

+# Modified in: 2016-01-01

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

 # Versions #

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

+# v1.12 - 2016-01-01: PS1 updated / extract function updated

 # v1.11 - 2015-08-17: sty-updater function added

 # v1.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

@@ -147,10 +148,16 @@ if [[ "$color_prompt" == "yes" ]]

 then

 	if [[ -n "$SSH_CONNECTION" ]]

     then

-		PS1='\[\e[31m\][$(date +%H:%M) \u@\[\e[01;35m\]\h\[\e[00;31m\]:\[\e[33m\]\W\[\e[31m\]]\[\e[00m\]\$ '

+		PS1='\[\e[31m\][$(date +%H:%M) \[\e[01;34m\]\u\[\e[00;31m\]@\[\e[01;35m\]\h\[\e[00;31m\]:\[\e[33m\]\W\[\e[31m\]]\[\e[00m\]\$ '

 	else

-		PS1='\[\e[36m\][$(date +%H:%M) \u@\[\e[01;35m\]\h\[\e[00;36m\]:\[\e[33m\]\W\[\e[36m\]]\[\e[00m\]\$ '

+		PS1='\[\e[36m\][$(date +%H:%M) \[\e[01;34m\]\u\[\e[00;36m\]@\[\e[01;35m\]\h\[\e[00;36m\]:\[\e[33m\]\W\[\e[36m\]]\[\e[00m\]\$ '

 	fi

+

+    if [[ $EUID -eq 0 ]]

+    then

+        PS1='\[\e[7m\]\[\e[31m\][$(date +%H:%M) \u@\h:\W]\[\e[00m\]\$ '

+    fi

+

 else

     PS1='[$(date +%H:%M) \u@\h:\W]\$ '

 fi

@@ -323,7 +330,8 @@ function extract {

 			*.bz2				) bunzip2 "$1" ;;

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

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

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

+			*.zip       		) unzip "$1" ;;

+			*.7z	        	) 7z x "$1" ;;

 			*.Z					) uncompress "$1" ;;

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

 		esac

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

 # Title: .bashrc

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

-# Version: 1.10

+# Version: 1.11

 # Created in: 2012-05-26

-# Modified in: 2015-04-19

+# Modified in: 2015-08-17

@@ -19,7 +19,8 @@

 # Versions #

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

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

+# v1.11 - 2015-08-17: sty-updater function added

+# v1.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

@@ -387,6 +388,26 @@ function start_agent {

 }

+# STY updater

+# Usage: reset the STY value after change in screen session name

+function sty-updater {

+    # Check for STY presence

+    if [[ -z "$STY" ]]

+    then

+        echo "No STY present."

+    else

+        # Get the current STY value

+        old_sty=$STY

+

+        # Update STY with the new value

+        export STY=$(screen -list | sed "s/^\t//g" | grep $(echo $STY | cut -d "." -f 1) | cut -f 1)

+

+        # Info message

+        echo -e "The STY value has been updated:\n\t- old value: $old_sty\n\t- new value: $STY"

+    fi

+}

+

+

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

 # User specific environment and startup programs #

@@ -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

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

 # Title: .bashrc

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

-# Version: 1.8

+# Version: 1.9

 # Created in: 2012-05-26

-# Modified in: 2014-10-14

+# Modified in: 2014-10-18

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

 # Versions #

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

+# 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

 # v1.6 - 2014-08-16: new history entries to ignore / screen and :q aliases

@@ -96,24 +97,48 @@ shopt -s autocd

 [[ -x /usr/bin/lesspipe ]] && eval "$(SHELL=/bin/sh lesspipe)"

+#--------------------#

+# Terminal selection #

+#--------------------#

+

+# To select the right terminal

+# (case of distant server that may not possess color capabilty for terminal)

+# source: http://stackoverflow.com/questions/6787734/strange-behavior-of-vim-color-inside-screen-with-256-colors

+case "$TERM" in

+    *-256color)

+        alias myssh="TERM=${TERM%-256color} ssh"

+        ;;

+    *)

+        POTENTIAL_TERM=${TERM}-256color

+#       POTENTIAL_TERMINFO=${TERM:0:1}/$POTENTIAL_TERM

+#       HOME_TERMINFO_DIR=$HOME/.terminfo

+

+        if [[ $(toe -a | cut -f 1 | grep $POTENTIAL_TERM) ]]

+        then

+            export TERM=$POTENTIAL_TERM

+#       elif [[ -f $HOME_TERMINFO_DIR/$POTENTIAL_TERMINFO ]]

+#       then

+#           export TERM=$POTENTIAL_TERM

+        fi

+

+        alias myssh="ssh"

+        ;;

+esac

+

+unset POTENTIAL_TERM BOX_TERMINFO_DIR HOME_TERMINFO_DIR

+

+

+

 #---------------#

 # Color options #

 #---------------#

-# Set a fancy prompt (non-color, unless we know we "want" color)

-force_color_prompt=yes

-

-if [ -n "$force_color_prompt" ]

+# Set a fancy prompt if capability present

+if [[ -x /usr/bin/tput && $(tput -T$TERM colors) -ge 8 ]]

 then

-    if [ -x /usr/bin/tput ] && tput setaf 1 >&/dev/null

-    then

-		# We have color support; assume it's compliant with Ecma-48

-		# (ISO/IEC-6429). (Lack of such support is extremely rare, and such

-		# a case would tend to support setf rather than setaf.)

-		color_prompt=yes

-    else

-		color_prompt=

-    fi

+    color_prompt=yes

+else

+	color_prompt=

 fi

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

@@ -136,16 +161,16 @@ PS1="${debian_chroot:+($debian_chroot)}$PS1"

 # Enable colors for man pages (adapt colors as needed)

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

 then

-	export LESS_TERMCAP_mb=$'\e[01;31m'    # blink start

-	export LESS_TERMCAP_md=$'\e[01;33m'    # bold start (if white bg: $'\e[01;31m')

-	export LESS_TERMCAP_me=$'\e[0m'        # end

-	export LESS_TERMCAP_se=$'\e[0m'        # end

-	export LESS_TERMCAP_so=$'\e[01;44;33m' # status line start

-	export LESS_TERMCAP_ue=$'\e[0m'        # end

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

+    export LESS_TERMCAP_mb=$'\e[01;31m'    # blink start

+    export LESS_TERMCAP_md=$'\e[01;33m'    # bold start (if white bg: $'\e[01;31m')

+    export LESS_TERMCAP_me=$'\e[0m'        # end

+    export LESS_TERMCAP_se=$'\e[0m'        # end

+    export LESS_TERMCAP_so=$'\e[01;44;33m' # status line start

+    export LESS_TERMCAP_ue=$'\e[0m'        # end

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

 fi

-unset color_prompt force_color_prompt

+unset color_prompt

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

@@ -184,11 +209,12 @@ 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="ssh -Y"

+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"

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

 # Title: .bashrc

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

-# Version: 1.7

+# Version: 1.8

 # Created in: 2012-05-26

-# Modified in: 2014-09-25

+# Modified in: 2014-10-14

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

 # Versions #

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

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

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

 # v1.6 - 2014-08-16: new history entries to ignore / screen and :q aliases

 # v1.5 - 2014-08-06: autocd set on / R alias added /bk function turned in a separate script / SSH environment setup moved in bash_profile

@@ -60,8 +61,7 @@ export HISTCONTROL=ignoreboth

 # Ignore some controlling instructions

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

-export HISTIGNORE=$'[ \t]*:&:[fb]g:exit:*q:screen*'

-# export HISTIGNORE=$'[ \t]*:&:[fb]g:exit:ls' # Ignore the ls command as well

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

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

 #export PROMPT_COMMAND="history -a"

@@ -352,7 +352,7 @@ function start_agent {

     # SSH agent environment

     echo -e "\n${msg1}"

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

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

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

     chmod 600 "${SSH_ENV}"

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

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

 # Title: .bashrc

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

-# Version: 1.6

+# Version: 1.7

 # Created in: 2012-05-26

-# Modified in: 2014-08-16

+# Modified in: 2014-09-25

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

 # Versions #

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

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

 # v1.6 - 2014-08-16: new history entries to ignore / screen and :q aliases

 # v1.5 - 2014-08-06: autocd set on / R alias added /bk function turned in a separate script / SSH environment setup moved in bash_profile

 # v1.4 - 2014-07-26: ssh_agent function for SSH key management added / ssh_agent called when used SSH connexion / wf alias updated

@@ -355,8 +356,8 @@ function start_agent {

     chmod 600 "${SSH_ENV}"

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

-    # SSH key add

-    ssh-add

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

+    ssh-add $@ 

 }

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

 # Title: .bashrc

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

-# Version: 1.5

+# Version: 1.6

 # Created in: 2012-05-26

-# Modified in: 2014-08-06

+# Modified in: 2014-08-16

@@ -19,7 +19,8 @@

 # Versions #

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

-# v1.5 - 2014-08-06: autocd set on / R alias added / bk function turned in a separate script / SSH environment setup moved in bash_profile

+# v1.6 - 2014-08-16: new history entries to ignore / screen and :q aliases

+# v1.5 - 2014-08-06: autocd set on / R alias added /bk function turned in a separate script / SSH environment setup moved in bash_profile

 # v1.4 - 2014-07-26: ssh_agent function for SSH key management added / ssh_agent called when used SSH connexion / wf alias updated

 # v1.3 - 2014-07-19: bug correction for PS1 (\[\e and \] missing for each color) / typo corrections

 # v1.2 - 2014-07-06: h and t aliases corrected / m alias added / quit function added / R env variables added

@@ -58,7 +59,7 @@ export HISTCONTROL=ignoreboth

 # Ignore some controlling instructions

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

-export HISTIGNORE=$'[ \t]*:&:[fb]g:exit'

+export HISTIGNORE=$'[ \t]*:&:[fb]g:exit:*q:screen*'

 # export HISTIGNORE=$'[ \t]*:&:[fb]g:exit:ls' # Ignore the ls command as well

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

@@ -205,7 +206,10 @@ alias h="head"

 alias t="tail"

 alias m="more"

 alias bye="exit"

+alias :q="exit"

 alias R="R --no-save"

+alias s="screen -D -RR"

+alias ns="screen"

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

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

 # Title: .bashrc

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

-# Version: 1.4

+# Version: 1.5

 # Created in: 2012-05-26

-# Modified in: 2014-07-26

+# Modified in: 2014-08-06

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

 # Versions #

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

+# v1.5 - 2014-08-06: autocd set on / R alias added / bk function turned in a separate script / SSH environment setup moved in bash_profile

 # v1.4 - 2014-07-26: ssh_agent function for SSH key management added / ssh_agent called when used SSH connexion / wf alias updated

 # v1.3 - 2014-07-19: bug correction for PS1 (\[\e and \] missing for each color) / typo corrections

 # v1.2 - 2014-07-06: h and t aliases corrected / m alias added / quit function added / R env variables added

@@ -87,7 +88,7 @@ shopt -s checkwinsize

 shopt -s cdspell

 # Avoid cd usage

-#shopt -s autocd

+shopt -s autocd

 # Make less more friendly for non-text input files, see lesspipe(1)

 [[ -x /usr/bin/lesspipe ]] && eval "$(SHELL=/bin/sh lesspipe)"

@@ -204,6 +205,7 @@ alias h="head"

 alias t="tail"

 alias m="more"

 alias bye="exit"

+alias R="R --no-save"

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

@@ -315,18 +317,6 @@ else

 fi

-# Backup function

-function bk {

-	if [[ -f "$1" || -d "$1" ]]

-	then

-		mydate=$(date +%F)

-		cp -R "$1" "$1.bk_$mydate"

-	else

-		echo -e "$1 is not a file or a directory"

-	fi

-}

-

-

 # Quit function

 function q {

     read -a ans -p "Do you want to exit [Y/n]? "

@@ -342,6 +332,8 @@ function q {

 # SSH agent function

+# Usage: function used to store SSH environment (SSH key in ssh-agent)

+# See .bash_profile from servers for use

 function start_agent {

     if [[ $LANG =~ ^fr ]]

     then

@@ -392,17 +384,5 @@ export R_HISTSIZE=$HISTSIZE

 # SSH environment

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

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

-if [[ -n "$SSH_CONNECTION" ]]

-then

-	# Source SSH settings, if applicable

-	if [[ -f "${SSH_ENV}" ]]

-	then

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

-		#ps ${SSH_AGENT_PID} doesn't work under cywgin

-		ps -ef | grep ${SSH_AGENT_PID} | grep ssh-agent$ > /dev/null || start_agent

-	else

-		start_agent

-	fi

-fi

\ No newline at end of file

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

 # Title: .bashrc

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

-# Version: 1.3

+# Version: 1.4

 # Created in: 2012-05-26

-# Modified in: 2014-07-19

+# Modified in: 2014-07-26

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

 # Versions #

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

+# v1.4 - 2014-07-26: ssh_agent function for SSH key management added / ssh_agent called when used SSH connexion / wf alias updated

 # v1.3 - 2014-07-19: bug correction for PS1 (\[\e and \] missing for each color) / typo corrections

 # v1.2 - 2014-07-06: h and t aliases corrected / m alias added / quit function added / R env variables added

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

@@ -91,23 +92,6 @@ shopt -s cdspell

 # Make less more friendly for non-text input files, see lesspipe(1)

 [[ -x /usr/bin/lesspipe ]] && eval "$(SHELL=/bin/sh lesspipe)"

-## Key binding

-#bind '"\e[1~": beginning-of-line'		# home

-#bind '"\e[2~": overwrite-mode'			# insert

-#bind '"\e[3~": delete-char'				# del

-#bind '"\e[4~": end-of-line'				# end

-#bind '"\e[5~": history-search-backward'	# page up

-#bind '"\e[6~": history-search-forward'	# page down

-#bind '"\e[A": up-line-or-history'		# arrow up

-#bind '"\e[B": down-line-or-history'		# arrow down

-#bind '"\e[C": forward-char'				# arrow right

-#bind '"\e[D": backward-char'			# arrow left

-

-#bind '"\e[H":  beginning-of-line'		# home (xterm)

-#bind '"\e[F":  end-of-line'				# end (xterm)

-

-#bind '"^R": history-incremental-search-backward'

-

 #---------------#

 # Color options #

@@ -131,7 +115,7 @@ fi

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

 then

-	 if [[ -n "$SSH_CONNECTION" ]]

+	if [[ -n "$SSH_CONNECTION" ]]

     then

 		PS1='\[\e[31m\][$(date +%H:%M) \u@\[\e[01;35m\]\h\[\e[00;31m\]:\[\e[33m\]\W\[\e[31m\]]\[\e[00m\]\$ '

 	else

@@ -202,7 +186,7 @@ alias diff="diff -y --suppress-common-lines"

 alias dl="wget -c"

 alias scp="scp -pr"

 alias ssh="ssh -Y"

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

+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"

@@ -357,6 +341,29 @@ function q {

 }

+# SSH agent function

+function start_agent {

+    if [[ $LANG =~ ^fr ]]

+    then

+        msg1="Initialisation du nouvel agent SSH..."

+        msg2="Opération réussi"

+    else

+        msg1="Initializing new SSH agent..."

+        msg2="Succeeded"

+    fi

+

+    # SSH agent environment

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

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

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

+    chmod 600 "${SSH_ENV}"

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

+

+    # SSH key add

+    ssh-add

+}

+

+

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

 # User specific environment and startup programs #

@@ -382,3 +389,20 @@ export TEXMFHOME="$HOME/.texmf"

 # R environment

 export R_HISTFILE="$HOME/.Rhistory"

 export R_HISTSIZE=$HISTSIZE

+

+

+# SSH environment

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

+

+if [[ -n "$SSH_CONNECTION" ]]

+then

+	# Source SSH settings, if applicable

+	if [[ -f "${SSH_ENV}" ]]

+	then

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

+		#ps ${SSH_AGENT_PID} doesn't work under cywgin

+		ps -ef | grep ${SSH_AGENT_PID} | grep ssh-agent$ > /dev/null || start_agent

+	else

+		start_agent

+	fi

+fi

\ No newline at end of file

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

 # Title: .bashrc

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

-# Version: 1.2

+# Version: 1.3

 # Created in: 2012-05-26

-# Modified in: 2014-07-06

+# Modified in: 2014-07-19

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

 # Versions #

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

+# v1.3 - 2014-07-19: bug correction for PS1 (\[\e and \] missing for each color) / typo corrections

 # v1.2 - 2014-07-06: h and t aliases corrected / m alias added / quit function added / R env variables added

 # 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

@@ -31,16 +32,16 @@

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

 # If not running interactively, don't do anything

-[ -z "$PS1" ] && return

+[[ -z "$PS1" ]] && return

 # Enable programmable completion features

-if [ -f /etc/bash_completion ] && ! shopt -oq posix

+if [[ -f /etc/bash_completion ]] && ! shopt -oq posix

 then

     . /etc/bash_completion

 fi

 # Set variable identifying the chroot you work in (used in the prompt below)

-if [ -z "$debian_chroot" ] && [ -r /etc/debian_chroot ]

+if [[ -z "$debian_chroot" && -r /etc/debian_chroot ]]

 then

     debian_chroot=$(cat /etc/debian_chroot)

 fi

@@ -88,7 +89,7 @@ shopt -s cdspell

 #shopt -s autocd

 # Make less more friendly for non-text input files, see lesspipe(1)

-[ -x /usr/bin/lesspipe ] && eval "$(SHELL=/bin/sh lesspipe)"

+[[ -x /usr/bin/lesspipe ]] && eval "$(SHELL=/bin/sh lesspipe)"

 ## Key binding

 #bind '"\e[1~": beginning-of-line'		# home

@@ -128,13 +129,13 @@ then

     fi

 fi

-if [ "$color_prompt" = yes ]

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

 then

-	 if [ -n "$SSH_CONNECTION" ]

+	 if [[ -n "$SSH_CONNECTION" ]]

     then

-		PS1='\[\e[31m\][$(date +%H:%M) \u@\e[01;35m\h\e[00;36m:\[\e[33m\]\W\[\e[31m\]]\[\e[00m\]\$ '

+		PS1='\[\e[31m\][$(date +%H:%M) \u@\[\e[01;35m\]\h\[\e[00;31m\]:\[\e[33m\]\W\[\e[31m\]]\[\e[00m\]\$ '

 	else

-		PS1='\[\e[36m\][$(date +%H:%M) \u@\e[01;35m\h\e[00;36m:\[\e[33m\]\W\[\e[36m\]]\[\e[00m\]\$ '

+		PS1='\[\e[36m\][$(date +%H:%M) \u@\[\e[01;35m\]\h\[\e[00;36m\]:\[\e[33m\]\W\[\e[36m\]]\[\e[00m\]\$ '