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

diff --git a/bashrc b/bashrc
index cbd3ac2..ac6d696 100644
--- a/bashrc
+++ b/bashrc
@@ -96,7 +96,8 @@ 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 kj="keyjnote -s -D 1000 -t Crossfade -T 100"
+alias im="impressive -s -D 1000 -t Crossfade -T 100"
 
 # alias fdupes='fdupes -r .'
 
@@ -108,12 +109,14 @@ if [ -e "${HOME}/.dircolors" ]; then
     # alias ll='ls --color -lth'
     alias lt='ls --color -gohtr --time-style="+%Y %b %d %H:%M"'
     alias ll='ls --color -goh --time-style="+%Y %b %d %H:%M"'
+    alias lll='ls --color -lth'
     alias l='ls --color -I "*~" -I "*.o"'
     alias less='less -R'
 else
     # alias ll='ls -lth'
     alias lt='ls -gohtr --time-style="+%Y %b %d %H:%M"'
     alias ll='ls -goh --time-style="+%Y %b %d %H:%M"'
+    alias lll='ls -lth'
     alias l='ls -I "*~" -I "*.o"'
 fi
 
@@ -133,7 +136,7 @@ export FIGNORE="CVS"
 function fn () {
     name=$1
     shift
-    find $* -name "*${name}*";
+    find "$@" -name "*${name}*";
 }
 
 # Create a dir and cd there
@@ -143,6 +146,39 @@ function mcd () {
     cd $1
 }
 
+# Capture the screen in a dated png
+
+function cap () {
+    if [[ $2 ]]; then
+        name=$2
+    else
+        name="capture-$(date +%s).png"
+    fi
+    echo "Waiting $1 s and saving to ${name}."
+    [[ $1 ]] && sleep $1
+    echo "Please click on the window to capture."
+    xwd  | convert - ${name}
+    \ls -l ${name}
+}
+
+# Create and CD in a /tmp/tmp.XXXXXX directory. With the '-'
+# arguments, do not create one and CD in the most recent instead
+
+function cdt () {
+    if [[ $1 ]]; then
+        if [[ $1 == "-" ]]; then
+            cd $(\ls -td /tmp/tmp.?????? | head -1)
+        else
+            echo "USAGE: cdt [-]" >&2
+            return 1
+        fi
+    else
+        cd $(mktemp -d /tmp/tmp.XXXXXX)
+    fi
+}
+
+alias t='cd /tmp'
+
 alias trash=trash.sh
 
 function mmsget () {
@@ -178,7 +214,7 @@ function map () {
 function pho () {
     PHO_BIN=/usr/bin/pho
     TEMP=$(mktemp /tmp/pho.XXXXXXX)
-    ${PHO_BIN} $* | tee ${TEMP}
+    ${PHO_BIN} "$@" | tee ${TEMP}
     PHO_NOTE_1=$(grep ^"Note 1: " ${TEMP} | sed -e "s/^[^:]*: //")
     PHO_NOTE_2=$(grep ^"Note 2: " ${TEMP} | sed -e "s/^[^:]*: //")
     PHO_NOTE_3=$(grep ^"Note 3: " ${TEMP} | sed -e "s/^[^:]*: //")
@@ -224,13 +260,21 @@ function dt () {
 
 function ifup () {
     echo "${VT_BOLD}${VT_GREEN_FG}This is the bash function ifup from .bashrc${VT_RESET}"
-    if [[ ! $* ]] && [[ -s ${IFUPRC} ]]; then
-        # If we have no argument and there is a .ifuprc, use it
-        ARGS=$(cat ${IFUPRC})
+    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}
     else
-        # Otherwise uses the given arguments, and store them
-        ARGS=$*
-        echo ${ARGS} > ${IFUPRC}
+        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
     fi
     echo "${VT_GREEN_FG}Running [sudo ifup ${ARGS}]${VT_RESET}"
     sudo ifup ${ARGS}
@@ -251,7 +295,7 @@ function ifdown () {
     if [[ ! $* ]] && [[ -s ${IFUPRC} ]]; then
         # If there are no arguments and there is a .ifuprc, get the
         # interface from it
-        ARGS=$(cat ${IFUPRC} | sed -e "s/=.*$//")
+        ARGS=$(tail -1 ${IFUPRC} | sed -e "s/=.*$//")
     else
         # Otherwise, use the standard ifdown
         ARGS=$*
@@ -270,8 +314,9 @@ function checkgw () {
 function lr () {
     HEIGHT=$(stty size | awk '{print $1}')
     WIDTH=$(stty size | awk '{print $2}')
-    \ls -goth  --time-style="+%Y %b %d %H:%M" $* | head -$((HEIGHT-2)) | cut -b1-${WIDTH}
-    # \ls -lth $* | head -$((HEIGHT-2)) | cut -b1-${WIDTH}
+    \ls -goth --time-style="+%Y %b %d %H:%M" "$@" | \
+        head -$((HEIGHT-2)) | \
+        cut -b1-${WIDTH}
 }
 
 ######################################################################
@@ -374,7 +419,7 @@ function dvd () {
 function ripdvd () {
     mkdir -p ${HOME}/dvds
     cd ${HOME}/dvds
-    dvdbackup -v -M && eject
+    time dvdbackup -v -M && eject
 }
 
 ######################################################################
@@ -690,7 +735,7 @@ PS1="\[${VT_YELLOW_BG}\]\${HISTORY_CUE}\[${VT_RESET}\]${PS1}"
 #
 # git clone http://fleuret.org/git/dus/
 
-alias dus='dus -f'
+alias dus='dus -f -i'
 
 ######################################################################
 # The finddup command is available on my web site
@@ -713,29 +758,47 @@ alias gma='gma.sh'
 # git clone http://fleuret.org/git/selector/
 
 function selector-history () {
-    selector --bash -c 7,4,0,3 -q -l 15000 <(history)
+    selector --bash -c 7,4,0,3 -q <(history)
 }
 
 # Find pathes in the history and make a list of the existing ones
 
 function selector-cd () {
-    LIST_TEMP=$(mktemp /tmp/selector-cd-list.XXXXXX)
-    PATH_TEMP=$(mktemp /tmp/selector-cd-path.XXXXXX)
-    for d in $(history | \
-        grep ^" *[0-9]* *cd" | \
-        awk '{ print $3 }' | \
-        grep -v "\.\." | \
-        uniq); do
-        if [[ -d $d ]]; then
-            echo "$d"
-        fi
-    done >> ${LIST_TEMP}
-    selector -d -i -o ${PATH_TEMP} ${LIST_TEMP}
-    cd $(cat ${PATH_TEMP})
-    \rm ${LIST_TEMP}
-    \rm ${PATH_TEMP}
+    CD_HISTORY=${HOME}/.selector-cd-history
+    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}|")
+        \rm ${PATH_TEMP}
+    else
+        cd $1 && echo $PWD | sed -e "s|${HOME}|~|" >> ${CD_HISTORY}
+    fi
 }
 
+alias cd=selector-cd
+
+# M-c provides a dynamic list of directories to cd into
+
+bind '"\C-[c":"\C-a\C-kselector-cd +\C-m"'
+
+# function selector-cd () {
+#     LIST_TEMP=$(mktemp /tmp/selector-cd-list.XXXXXX)
+#     PATH_TEMP=$(mktemp /tmp/selector-cd-path.XXXXXX)
+#     for d in $(history | \
+#         grep ^" *[0-9]* *cd" | \
+#         awk '{ print $3 }' | \
+#         grep -v "\.\." | \
+#         uniq); do
+#         if [[ -d $d ]]; then
+#             echo "$d"
+#         fi
+#     done >> ${LIST_TEMP}
+#     selector -d -i -o ${PATH_TEMP} ${LIST_TEMP}
+#     cd $(cat ${PATH_TEMP})
+#     \rm ${LIST_TEMP}
+#     \rm ${PATH_TEMP}
+# }
+
 # M-r puts the selected history line in place of the current one
 
 bind '"\C-[r":"\C-a\C-kselector-history\C-m"'
@@ -744,15 +807,20 @@ bind '"\C-[r":"\C-a\C-kselector-history\C-m"'
 
 bind '"\C-[t":"\C-a\C-kselector-history\C-m\C-a\C-y\C-e"'
 
-# M-c provides a dynamic list of directories to cd into
-
-bind '"\C-[c":"\C-a\C-kselector-cd\C-m"'
-
 # And we avoid to put in the history the use of the selector, which we
 # do too often
 
 HISTIGNORE="${HISTIGNORE}:selector-history"
 
+function selector-printer () {
+    TMP=$(mktemp /tmp/selector-printer.XXXXXX)
+    selector -o ${TMP} <(lpstat -a | awk '{print $1}')
+    export PRINTER=$(cat ${TMP})
+    echo "PRINTER=${PRINTER}"
+    rm -f ${TMP}
+    lpq
+}
+
 ######################################################################
 
 function prompt_command () {