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

-}

+}