X-Git-Url: https://www.fleuret.org/cgi-bin/gitweb/gitweb.cgi?a=blobdiff_plain;f=bashrc;h=66dc58630a2c8a92fc0497204cc6278f7eeabd67;hb=bcb2c58dc4ae99501c193c207f9c69c350e66d92;hp=ac6d696bbe26838f9028e487883ed70725360247;hpb=6a45dbe664eebcb3050d0c3dfe9856f7c5815aca;p=scripts.git

diff --git a/bashrc b/bashrc
index ac6d696..66dc586 100644
--- a/bashrc
+++ b/bashrc
@@ -53,36 +53,47 @@ shopt -s histappend
 ######################################################################
 ## The interactive part
 
-export VT_RESET=$'\033[0m'
-export VT_BOLD=$'\033[1m'
-export VT_UNDERLINE=$'\033[4m'
-export VT_BLINK=$'\033[5m'
+export VT_RESET=$'\e[0m'
+export VT_BOLD=$'\e[1m'
+export VT_UNDERLINE=$'\e[4m'
+export VT_BLINK=$'\e[5m'
 
-export VT_SET_TITLE=$'\033]0;'
+export VT_SET_TITLE=$'\e]0;'
 export VT_END_TITLE=$'\007'
 
-export VT_BLACK_FG=$'\033[30m'
-export VT_RED_FG=$'\033[31m'
-export VT_GREEN_FG=$'\033[32m'
-export VT_YELLOW_FG=$'\033[33m'
-export VT_BLUE_FG=$'\033[34m'
-export VT_MAGENTA_FG=$'\033[35m'
-export VT_CYAN_FG=$'\033[36m'
-export VT_WHITE_FG=$'\033[37m'
-
-export VT_BLACK_BG=$'\033[40m'
-export VT_RED_BG=$'\033[41m'
-export VT_GREEN_BG=$'\033[42m'
-export VT_YELLOW_BG=$'\033[43m'
-export VT_BLUE_BG=$'\033[44m'
-export VT_MAGENTA_BG=$'\033[45m'
-export VT_CYAN_BG=$'\033[46m'
-export VT_WHITE_BG=$'\033[47m'
+export VT_BLACK_FG=$'\e[30m'
+export VT_RED_FG=$'\e[31m'
+export VT_GREEN_FG=$'\e[32m'
+export VT_YELLOW_FG=$'\e[33m'
+export VT_BLUE_FG=$'\e[34m'
+export VT_MAGENTA_FG=$'\e[35m'
+export VT_CYAN_FG=$'\e[36m'
+export VT_WHITE_FG=$'\e[37m'
+
+export VT_BLACK_BG=$'\e[40m'
+export VT_RED_BG=$'\e[41m'
+export VT_GREEN_BG=$'\e[42m'
+export VT_YELLOW_BG=$'\e[43m'
+export VT_BLUE_BG=$'\e[44m'
+export VT_MAGENTA_BG=$'\e[45m'
+export VT_CYAN_BG=$'\e[46m'
+export VT_WHITE_BG=$'\e[47m'
+
+# Colorize man pages!
+
+export LESS_TERMCAP_us=${VT_GREEN_FG}
+export LESS_TERMCAP_ue=${VT_RESET}
+export LESS_TERMCAP_md=${VT_BLUE_FG}${VT_BOLD}
+export LESS_TERMCAP_me=${VT_RESET}
+
+# export LESS_TERMCAP_md=$'\e[1;34;40m'
 
 # This prevents ^S from freezing the shell
 
 stty -ixon
 
+alias ..='cd ..'
+alias -- -='cd -'
 alias rm='rm -i'
 alias mv='mv -i'
 # alias chmod='chmod -v'
@@ -97,7 +108,7 @@ alias grep='grep -E --mmap'
 alias s='screen -d -R -U && clear'
 alias mc='echo Try mv ' # I'm fed up with midnight commander
 # alias kj="keyjnote -s -D 1000 -t Crossfade -T 100"
-alias im="impressive -s -D 1000 -t Crossfade -T 100"
+alias impressive="impressive -s -D 1000 -t Crossfade -T 100"
 
 # alias fdupes='fdupes -r .'
 
@@ -142,8 +153,8 @@ function fn () {
 # Create a dir and cd there
 
 function mcd () {
-    mkdir -vp $1
-    cd $1
+    mkdir -vp "$1"
+    cd "$1"
 }
 
 # Capture the screen in a dated png
@@ -155,7 +166,7 @@ function cap () {
         name="capture-$(date +%s).png"
     fi
     echo "Waiting $1 s and saving to ${name}."
-    [[ $1 ]] && sleep $1
+    [[ "$1" ]] && sleep "$1"
     echo "Please click on the window to capture."
     xwd  | convert - ${name}
     \ls -l ${name}
@@ -165,8 +176,8 @@ function cap () {
 # arguments, do not create one and CD in the most recent instead
 
 function cdt () {
-    if [[ $1 ]]; then
-        if [[ $1 == "-" ]]; then
+    if [[ "$1" ]]; then
+        if [[ "$1" == "-" ]]; then
             cd $(\ls -td /tmp/tmp.?????? | head -1)
         else
             echo "USAGE: cdt [-]" >&2
@@ -179,10 +190,24 @@ function cdt () {
 
 alias t='cd /tmp'
 
-alias trash=trash.sh
+function trash () {
+    TRASH=$(date +/tmp/trash-%Y-%b-%d-%Hh)
+
+    if [[ -d ${TRASH} ]]; then
+        echo "Re-use ${TRASH}"
+    else
+        mkdir ${TRASH}
+        echo "Created ${TRASH}"
+    fi
+
+    mv "$@" ${TRASH}
+    echo "Trashed $@"
+}
+
+# alias trash=trash.sh
 
 function mmsget () {
-    mplayer $1 -dumpstream -dumpfile $(basename $1)
+    mplayer "$1" -dumpstream -dumpfile $(basename "$1")
 }
 
 ######################################################################
@@ -193,7 +218,7 @@ function map () {
     if [ $# -lt 2 ] || [[ ! "$@" =~ :[[:space:]] ]];then
         echo "Invalid syntax." >&2; return 1
     fi
-    until [[ $1 =~ : ]]; do
+    until [[ "$1" =~ : ]]; do
         command="$command $1"; shift
     done
     command="$command ${1%:}"; shift
@@ -225,14 +250,14 @@ function pho () {
 }
 
 # function rotjpeg () {
-    # if [ $1 == "90" ] || [ $1 == "180" ] || [ $1 == "270" ]; then
+    # if [ "$1" == "90" ] || [ "$1" == "180" ] || [ "$1" == "270" ]; then
         # TEMP=$(mktemp /tmp/rotjpeg.XXXXXX)
-        # echo jpegtran -rotate $1 -copy all $2 > ${TEMP}
+        # echo jpegtran -rotate "$1" -copy all $2 > ${TEMP}
         # echo cp $2 ${2/jpg/}original.jpg
         # echo cp ${TEMP} $2
         # rm ${TEMP}
     # else
-        # echo "Can not rotate with an angle of $1 degrees."
+        # echo "Can not rotate with an angle of "$1" degrees."
     # fi
 # }
 
@@ -256,26 +281,21 @@ function dt () {
 ## When invoked without an argument this "ifdown" removes the last
 ## interface which was ifuped
 
-[[ ${IFUPRC} ]] || IFUPRC="${HOME}/.ifuprc"
+[[ ${NETUP_HISTORY} ]] || NETUP_HISTORY="${HOME}/.netup_history"
+
+alias ifup="echo Try netup"
+alias ifdown="echo Try netdown"
 
-function ifup () {
-    echo "${VT_BOLD}${VT_GREEN_FG}This is the bash function ifup from .bashrc${VT_RESET}"
-    if [[ "$1" == "-s" ]]; then
-        chosen_ifup=$(mktemp /tmp/chosen_ifup.XXXXXX)
-        selector -i -d -o ${chosen_ifup} ${IFUPRC}
-        ARGS=$(cat ${chosen_ifup})
-        rm -f ${chosen_ifup}
-        echo ${ARGS} >> ${IFUPRC}
+function netup () {
+    if [[ ! "$@" ]] && [[ -s ${NETUP_HISTORY} ]]; then
+        # If we have no argument and there is a .netup_history, use it
+        ARGS=$(cat ${NETUP_HISTORY})
     else
-        if [[ ! $* ]] && [[ -s ${IFUPRC} ]]; then
-            # If we have no argument and there is a .ifuprc, use it
-            ARGS=$(tail -1 ${IFUPRC})
-        else
-            # Otherwise uses the given arguments, and store them
-            ARGS=$*
-            echo ${ARGS} >> ${IFUPRC}
-        fi
+        # Otherwise uses the given arguments, and store them
+        ARGS="$@"
+        echo ${ARGS} > ${NETUP_HISTORY}
     fi
+
     echo "${VT_GREEN_FG}Running [sudo ifup ${ARGS}]${VT_RESET}"
     sudo ifup ${ARGS}
 
@@ -290,15 +310,14 @@ function ifup () {
     fi
 }
 
-function ifdown () {
-    echo "${VT_BOLD}${VT_GREEN_FG}This is the bash function ifdown from .bashrc${VT_RESET}"
-    if [[ ! $* ]] && [[ -s ${IFUPRC} ]]; then
-        # If there are no arguments and there is a .ifuprc, get the
+function netdown () {
+    if [[ ! "$@" ]] && [[ -s ${NETUP_HISTORY} ]]; then
+        # If there are no arguments and there is a .netup_history, get the
         # interface from it
-        ARGS=$(tail -1 ${IFUPRC} | sed -e "s/=.*$//")
+        ARGS=$(tail -1 ${NETUP_HISTORY} | sed -e "s/=.*$//")
     else
         # Otherwise, use the standard ifdown
-        ARGS=$*
+        ARGS="$@"
     fi
     echo "${VT_GREEN_FG}Running sudo [ifdown ${ARGS}]${VT_RESET}"
     sudo ifdown ${ARGS}
@@ -329,7 +348,7 @@ function lr () {
 # You can change the xterm background color on the fly!
 
 function setxtermbg () {
-    echo -n $'\033]11;'$1$'\007'
+    echo -n $'\e]11;'$1$'\007'
 }
 
 ######################################################################
@@ -362,17 +381,17 @@ function keep () {
 function burn () {
     set -e
     DEVICE="/dev/cdrw"
-    if [[ ! $1 ]]; then
+    if [[ ! "$1" ]]; then
         echo "burn <iso name | dirname>" >&2
-    elif [[ -f $1 ]]; then
-        if [[ $(file $1 | grep "ISO 9660") ]]; then
+    elif [[ -f "$1" ]]; then
+        if [[ $(file "$1" | grep "ISO 9660") ]]; then
             wodim -eject -v dev=${DEVICE} $1
         else
             echo "Unknown type of $1" >&2
         fi
-    elif [[ -d $1 ]]; then
+    elif [[ -d "$1" ]]; then
         TMP=$(mktemp /tmp/cdimage.XXXXXX) && \
-            genisoimage -input-charset iso8859-1 -r -o ${TMP} $1 && \
+            genisoimage -input-charset iso8859-1 -r -o ${TMP} "$1" && \
             wodim -eject -v dev=${DEVICE} ${TMP}
         rm -f ${TMP}
     else
@@ -391,7 +410,7 @@ function dvd () {
     echo " o         Show/hide the timing"
     echo
 
-    if [[ $1 ]]; then
+    if [[ "$1" ]]; then
         dvd_device="$1"
         shift
     else
@@ -400,7 +419,7 @@ function dvd () {
 
     title="1"
 
-    if [[ $1 ]]; then
+    if [[ "$1" ]]; then
         title=$1
         shift
     fi
@@ -522,8 +541,8 @@ function mksmall () {
 function mvtoconfig () {
     CONFIGDIR=${HOME}/sources/config
     if [[ -d ${CONFIGDIR} ]]; then
-        NEWNAME=${CONFIGDIR}/$(basename $1 | sed -e "s/^\.//")
-        mv $1 $NEWNAME
+        NEWNAME=${CONFIGDIR}/$(basename "$1" | sed -e "s/^\.//")
+        mv "$1" $NEWNAME
         ln -s $NEWNAME $1
     else
         echo "Can not find ${CONFIGDIR}"
@@ -628,8 +647,8 @@ function git-backup () {
 function bt () {
     if [[ ${BT_DIR} ]]; then
         if [[ -d "${BT_DIR}/torrents" ]]; then
-            if [[ $1 ]]; then
-                mv $1 ${BT_DIR}/torrents
+            if [[ "$1" ]]; then
+                mv "$1" ${BT_DIR}/torrents
             fi
             if [[ "$(ps auxwww | grep btlaunchmanycurses | grep -v grep)" ]]; then
                 echo "A client is already running."
@@ -707,7 +726,7 @@ function keep_local_history () {
         # mv would replace a symbolic link, while cp keeps it
         \cp ${TMP} ${LOCAL_HISTORY_FILE}
         \rm ${TMP}
-        LOCAL_HISTORY_HINT=" LH "
+        LOCAL_HISTORY_HINT="* "
     else
         LOCAL_HISTORY_HINT=""
     fi
@@ -718,8 +737,6 @@ PS1="\[${VT_WHITE_BG}\]\${LOCAL_HISTORY_HINT}\[${VT_RESET}\]${PS1}"
 ######################################################################
 # Switch off the history
 
-alias nh=" export HISTFILE=/dev/null"
-
 function histfile_cue () {
     if [[ ! "${HISTFILE}" == "${HOME}/.bash_history" ]]; then
         HISTORY_CUE="[${HISTFILE}]"
@@ -745,11 +762,6 @@ alias dus='dus -f -i'
 # alias finddup='finddup -p0d'
 alias finddup='finddup -p'
 
-######################################################################
-# This script grep messages in my mail archives
-
-alias gma='gma.sh'
-
 ######################################################################
 # Selector based history
 #
@@ -763,19 +775,26 @@ function selector-history () {
 
 # Find pathes in the history and make a list of the existing ones
 
+export CD_HISTORY=${HOME}/.selector-cd-history
+
 function selector-cd () {
-    CD_HISTORY=${HOME}/.selector-cd-history
-    if [[ $1 == "+" ]]; then
+    if [[ "$1" == "+" ]]; then
         PATH_TEMP=$(mktemp /tmp/selector-cd-path.XXXXXX)
         selector -d -i -o ${PATH_TEMP} ${CD_HISTORY}
-        cd $(cat ${PATH_TEMP} | sed -e "s|~|${HOME}|")
+        cd "$(cat ${PATH_TEMP} | sed -e 's|~|'${HOME}'|')"
         \rm ${PATH_TEMP}
     else
-        cd $1 && echo $PWD | sed -e "s|${HOME}|~|" >> ${CD_HISTORY}
+        if [[ -z "$1" ]]; then
+            cd
+        else
+            cd "$1"
+        fi
+        echo $PWD | sed -e "s|${HOME}|~|" >> ${CD_HISTORY}
     fi
 }
 
 alias cd=selector-cd
+alias cdd="cd $(tail -1 ${CD_HISTORY})"
 
 # M-c provides a dynamic list of directories to cd into