[[ ${TERM} == "dumb" ]] || [ ! -t 0 ] && return
+# Remove the annoying beeps in console
+
+setterm -blength 0
+
######################################################################
## 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
+# stty -ixon
+
+ulimit -c unlimited
+alias ..='cd ..'
+alias -- -='cd -'
alias rm='rm -i'
alias mv='mv -i'
# alias chmod='chmod -v'
alias chmod='chmod -c'
-alias cp='cp -i'
+alias cp='cp -i -v'
alias rd=rmdir
-alias md='mkdir -v'
+alias md='mkdir -pv'
alias ps='ps uxaf'
alias df='df -hT --sync'
-alias grep='grep -E --mmap'
+alias grep='grep -i -E --color=auto'
+alias find='ionice -c3 find'
+alias pd=pushd
+alias val='valgrind --leak-check=full --show-reachable=yes --db-attach=yes '
alias s='screen -d -R -U && clear'
-alias mc='echo Try mv ' # I'm fed up with midnight commander
+
+function nh () {
+ export HISTFILE=/dev/null
+ unalias cd
+}
+
+function ding () {
+ if [[ $1 && $(which winshepherd.sh) ]]; then
+ play -q ~/local/sounds/deskbell.wav &
+ unset E_APP_WINDOW
+ winshepherd.sh message green "$1"
+ else
+ play -q ~/local/sounds/deskbell.wav
+ fi
+}
+
# 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 .'
if [ -e "${HOME}/.dircolors" ]; then
eval $(dircolors "${HOME}/.dircolors")
- alias ls='ls --color'
- # 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 l='ls --color -I "*~" -I "*.o"'
+ alias ls='ls -p --group-directories-first --color'
+ alias lt='ls -p --color -gohtr --time-style="+%Y %b %d %H:%M"'
+ alias ll='ls -p --color -goh --time-style="+%Y %b %d %H:%M"'
+ alias lll='ls -p --color -lth'
+ alias l='ls -p --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 l='ls -I "*~" -I "*.o"'
+ alias ls='ls -p --group-directories-first'
+ alias lt='ls -p -gohtr --time-style="+%Y %b %d %H:%M"'
+ alias ll='ls -p -goh --time-style="+%Y %b %d %H:%M"'
+ alias lll='ls -p -lth'
+ alias l='ls -p -I "*~" -I "*.o"'
fi
export EDITOR=emacsclient
######################################################################
# Ignored extensions when completing
-export FIGNORE="CVS"
+# export FIGNORE="CVS"
+
+function latexdiff () {
+ # wdiff -n \
+ # -w $'\033[30;43m'"[$1]"$'\033[30;41m ' -x $'\033[0m' \
+ # -y $'\033[30;43m'"[$2]"$'\033[30;42m ' -z $'\033[0m' \
+ # $*
+
+ wdiff -n \
+ -w $'\033[30;41m' -x $'\033[0m' \
+ -y $'\033[30;42m' -z $'\033[0m' \
+ $*
+
+ # | \grep $'\033'"\|section{"
+}
+
+# Looks for the most recent .log and pdflatex + bibtex the
+# corresponding tex file
+
+function rl () {
+ RECENT_LOG=$(ls -t $(find -maxdepth 1 -name "*.log" -type f) | head -1)
+
+ if [[ ${RECENT_LOG} ]]; then
+ FILEBASE="${RECENT_LOG/.log/}"
+
+ if [[ -f "${FILEBASE}.tex" ]]; then
+
+ pdflatex "${FILEBASE}"
+ bibtex "${FILEBASE}"
+ pdflatex "${FILEBASE}"
+ pdflatex "${FILEBASE}"
+
+ if [[ "$1" ]]; then
+ if [[ "$1" == "-v" ]] || [[ "$1" == "--view" ]]; then
+ xpdf "${FILEBASE}.pdf"
+ elif [[ "$1" == "-p" ]] || [[ "$1" == "--print" ]]; then
+ lpr "${FILEBASE}.pdf"
+ else
+ echo "Usage: rl [-v|--view] [-p|--print]" >&2
+ echo "Unknown option $1" >&2
+ return 1
+ fi
+ fi
+
+ else
+
+ echo "Can not find a tex file corresponding to the most recent log (${RECENT_LOG/.log/})." >&2
+ return 1
+
+ fi
+
+ else
+ echo "Can not find a recent log." >&2
+ return 1
+ fi
+}
+
######################################################################
# Functions
-# Find a file containing a name
+# Find a file whose name contains a substring
function fn () {
name=$1
shift
- find $* -name "*${name}*";
+ find "$@" -name "*${name}*";
+}
+
+function bak () {
+ while [[ "$1" ]]; do
+ cp "$1" "$1".bak
+ shift
+ done
+}
+
+function ua () {
+
+ [[ "$1" ]] || ( echo "Universal unarchive: ua <file> [<file> ...]" >&2 && return 1)
+
+ while [[ "$1" ]]; do
+
+ case "$1" in
+
+ *.tgz|*.tar.gz|*.tbz|*.tar.bz2)
+ tar xvf "$1"
+ ;;
+
+ *.rar)
+ unrar -kb x "$1"
+ ;;
+
+ *.zip)
+ unzip "$1"
+ ;;
+
+ *)
+ echo "Unknown file extension $1"
+ ;;
+ esac
+
+ shift
+
+ done
}
# 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
function cap () {
- name="capture-$(date +%s).png"
- [[ $1 ]] && sleep $1
+ 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}
}
# 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
return 1
fi
else
- cd $(mktemp -d /tmp/tmp.XXXXXX)
+ dir=$(mktemp -d /tmp/tmp.XXXXXX)
+ link=/tmp/tmp
+ if [[ -h ${link} ]]; then
+ \rm ${link}
+ fi
+ if [[ ! -a ${link} ]]; then
+ ln -s ${dir} ${link}
+ fi
+ cd ${dir}
fi
}
alias t='cd /tmp'
-alias trash=trash.sh
+function trash () {
+ TRASH=$(date +/tmp/trash-%Y-%b-%d-%Hh)
+ LINK=/tmp/trash
+
+ mkdir -p ${TRASH}
+
+ [[ -h ${LINK} ]] && \rm ${LINK}
+ [[ ! -f ${LINK} ]] && ln -s ${TRASH} ${LINK}
+
+ mv "$@" ${TRASH}
+ echo "Trashed $@"
+}
function mmsget () {
- mplayer $1 -dumpstream -dumpfile $(basename $1)
+ mplayer "$1" -dumpstream -dumpfile $(basename "$1")
}
######################################################################
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
## variables
function pho () {
- PHO_BIN=/usr/bin/pho
TEMP=$(mktemp /tmp/pho.XXXXXXX)
- ${PHO_BIN} $* | tee ${TEMP}
+ $(which pho) "$@" | 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/^[^:]*: //")
PHO_NOTE_R90=$(grep ^"Rotate 90 \(CW\): " ${TEMP} | sed -e "s/^[^:]*: //")
PHO_NOTE_R180=$(grep ^"Rotate 180: " ${TEMP} | sed -e "s/^[^:]*: //")
PHO_NOTE_R270=$(grep ^"Rotate -90 \(CCW\): " ${TEMP} | sed -e "s/^[^:]*: //")
+ [[ "${PHO_NOTE_1}" ]] || unset PHO_NOTE_1
+ [[ "${PHO_NOTE_2}" ]] || unset PHO_NOTE_2
+ [[ "${PHO_NOTE_3}" ]] || unset PHO_NOTE_3
+ [[ "${PHO_NOTE_R90}" ]] || unset PHO_NOTE_R90
+ [[ "${PHO_NOTE_R180}" ]] || unset PHO_NOTE_R180
+ [[ "${PHO_NOTE_R270}" ]] || unset PHO_NOTE_R270
\rm ${TEMP}
}
-# function rotjpeg () {
- # if [ $1 == "90" ] || [ $1 == "180" ] || [ $1 == "270" ]; then
- # TEMP=$(mktemp /tmp/rotjpeg.XXXXXX)
- # 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."
- # fi
-# }
-
######################################################################
## A version of date that shows the time at home if TZ is set
######################################################################
## ifup / ifdown with sudo and memorization of the network
-## When invoked without an argument this "ifup" uses the same argument
-## as the previous time
+## When invoked without an argument netup uses the same argument as
+## the previous time
-## When invoked without an argument this "ifdown" removes the last
-## interface which was ifuped
+## When invoked without an argument netdown removes the last interface
+## which was netuped
-[[ ${IFUPRC} ]] || IFUPRC="${HOME}/.ifuprc"
+[[ ${NETUP_HISTORY} ]] || NETUP_HISTORY="${HOME}/.netup_history"
-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 -o ${chosen_ifup} <(cat ${IFUPRC} | sort | uniq)
- ARGS=$(cat ${chosen_ifup})
- rm -f ${chosen_ifup}
- echo ${ARGS} >> ${IFUPRC}
- 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}
+function netup () {
+ WIFI_INTERFACE=wlan0
+
+ if [[ $1 == "--scan" ]]; then
+ if [[ ! $(\ifconfig -s | grep ${WIFI_INTERFACE}) ]]; then
+ sudo ifconfig ${WIFI_INTERFACE} up
+ UPPED_WIFI=1
+ fi
+
+ sudo iwlist ${WIFI_INTERFACE} scan|grep ESS\|Quali\|Encry
+
+ if [[ ${UPPED_WIFI} ]]; then
+ sudo ifconfig ${WIFI_INTERFACE} down
fi
+
+ return 0
+ fi
+
+ if [[ $(\ifconfig -s | grep -v ^"(Iface|lo) ") ]]; then
+ echo "There is already interface(s) up." >&2
+ return 1
+ fi
+
+ if [[ $(\ps -C dhclient | tail -n +2) ]]; then
+ echo "There is already a dhcp client running." >&2
+ return 1
+ fi
+
+ if [[ $(\ps -C wpa_supplicant | tail -n +2) ]]; then
+ echo "There is already a wpa_supplicant running." >&2
+ return 1
+ fi
+
+ if [[ ! "$@" ]] && [[ -s ${NETUP_HISTORY} ]]; then
+ echo "netup <interface>" >&2
+ return 1
+ # # If we have no argument and there is a .netup_history, use it
+ # ARGS=$(cat ${NETUP_HISTORY})
+ else
+ # Otherwise uses the given arguments, and store them
+ ARGS="$@"
+ echo ${ARGS} > ${NETUP_HISTORY}
+ fi
+
+ if [[ -n "${PRIVATE_INTERFACE_DEFINITION}" ]]; then
+ ARGS="-i ${PRIVATE_INTERFACE_DEFINITION} ${ARGS}"
fi
- echo "${VT_GREEN_FG}Running [sudo ifup ${ARGS}]${VT_RESET}"
+
+ echo "Executing ${VT_GREEN_FG}[sudo ifup ${ARGS}]${VT_RESET}"
sudo ifup ${ARGS}
# Ugly hack to remove the dsl modem dns server when we add
# explicitely a dns in the /etc/network/interfaces
REMOVE_LOCAL_DNS=/usr/local/bin/remove-local-dns.sh
+ # REMOVE_LOCAL_DNS=${HOME}/sources/scripts/remove-local-dns.sh
if [[ -x ${REMOVE_LOCAL_DNS} ]]; then
- echo "${VT_GREEN_FG}Running [sudo ${REMOVE_LOCAL_DNS} 192.168]${VT_RESET}"
+ echo "Executing ${VT_GREEN_FG}[sudo ${REMOVE_LOCAL_DNS} 192.168]${VT_RESET}"
sudo ${REMOVE_LOCAL_DNS} 192.168
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
+
+ if [[ -n "${PRIVATE_INTERFACE_DEFINITION}" ]]; then
+ ARGS="-i ${PRIVATE_INTERFACE_DEFINITION} ${ARGS}"
fi
- echo "${VT_GREEN_FG}Running sudo [ifdown ${ARGS}]${VT_RESET}"
+
+ echo "Executing sudo ${VT_GREEN_FG}[ifdown ${ARGS}]${VT_RESET}"
sudo ifdown ${ARGS}
+
+ # if [[ $(\ps -C dhclient | tail -n +2) ]]; then
+ # echo "There is still a dhcp client running." >&2
+ # return 1
+ # fi
+
+ # if [[ $(\ps -C wpa_supplicant | tail -n +2) ]]; then
+ # echo "There is still a wpa_supplicant running." >&2
+ # return 1
+ # fi
}
function checkgw () {
- ping $(route -n | grep ^0.0.0.0 | awk '{print $2}')
+ GW=$(route -n | grep ^0.0.0.0 | awk '{print $2}')
+ if [[ -n "${GW}" ]]; then
+ ping ${GW}
+ else
+ echo "Can not find a getaway." >&2
+ return 1
+ fi
}
######################################################################
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}
}
######################################################################
# cd and ls into a directory
# [from http://www.oreillynet.com/onlamp/blog/2007/01/whats_in_your_bash_history.html]
-# function c () { cd "$@" && lr; }
+function c () { cd "$@" && 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'
}
######################################################################
function keep () {
if [[ ${KEPT_COMMANDS} ]]; then
- LINE=$(history | tail -2 | head -1 | sed -e "s/^[0-9 ]*//")
+ LINE="$*"
+ [[ "${LINE}" ]] || LINE=$(history | tail -2 | head -1 | sed -e "s/^[0-9 ]*//")
echo $LINE
echo $(date)": "${LINE} >> ${KEPT_COMMANDS}
else
# I sometime burn CDs and DVDs
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
- wodim -eject -v dev=${DEVICE} $1
+ 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
- TMP=$(mktemp /tmp/cdimage.XXXXXX) && \
- genisoimage -input-charset iso8859-1 -r -o ${TMP} $1 && \
+ elif [[ -d "$1" ]]; then
+ [[ "${TMP_ROOT}" ]] || TMP_ROOT=/tmp/
+ echo "Using ${TMP_ROOT} as temporary directory."
+ TMP=$(mktemp ${TMP_ROOT}/cdimage.XXXXXX) && \
+ genisoimage -input-charset iso8859-1 -r -o ${TMP} "$1" && \
wodim -eject -v dev=${DEVICE} ${TMP}
rm -f ${TMP}
else
function dvd () {
echo
- echo " ! and @ Seek to the beginning of the previous/next chapter"
- echo " j Cycle through the available subtitles"
- echo " o Show/hide the timing"
+ echo " ! @ Seek to the beginning of the previous/next chapter"
+ echo " j Cycle through the available subtitles"
+ echo " o Show/hide the timing"
+ echo " x z Subtitle delay"
+ echo " / * Volume"
echo
- if [[ $1 ]]; then
+ if [[ "$1" ]]; then
dvd_device="$1"
shift
else
- dvd_device="/dev/cdrom"
+ dvd_device="/dev/dvd"
fi
title="1"
- if [[ $1 ]]; then
+ if [[ "$1" ]]; then
title=$1
shift
fi
+ # -vc ffmpeg12 -vf yadif
+
mplayer > /dev/null \
-stop-xscreensaver \
- -vc ffmpeg12 -quiet \
- -vf yadif \
- -alang en \
- -dvd-device ${dvd_device} dvd://${title}
-
-# -slang en
-
+ -quiet \
+ -alang en -slang en \
+ -softvol -softvol-max 1000 \
+ -dvd-device ${dvd_device} $* dvd://${title}
}
function ripdvd () {
+ if [[ -e "/dev/dvd" ]]; then
+ DVD_DEVICE="/dev/dvd"
+ elif [[ -e "/dev/dvd3" ]]; then
+ DVD_DEVICE="/dev/dvd3"
+ else
+ echo "Can not find the dvd device." >&2
+ return 1
+ fi
+
+ echo "Attemptin to rip from ${DVD_DEVICE}."
+
mkdir -p ${HOME}/dvds
+
cd ${HOME}/dvds
- time dvdbackup -v -M && eject
+ time dvdbackup -i ${DVD_DEVICE} -v -M $* && eject
}
+alias ripcd=abcde
+
######################################################################
# Upload the sources from the current directory to work
echo "The file ${DEST_DIR}/$i already exists."
else
- orientation=$(exif $i \
- | grep ^Orientation \
- | head -1 \
- | sed -e "s/^[^|]*|//" \
- | sed -e "s/ *$//")
+ # orientation=$(exif $i \
+ # | grep ^Orientation \
+ # | head -1 \
+ # | sed -e "s/^[^|]*|//" \
+ # | sed -e "s/ *$//")
- case ${orientation} in
- ""|"top - left")
- rotation_cmd=""
- ;;
+ # case ${orientation} in
+ # ""|"top - left")
+ # rotation_cmd=""
+ # ;;
- "right - top")
- rotation_cmd="-rotate 90"
- ;;
+ # "right - top")
+ # rotation_cmd="-rotate 90"
+ # ;;
- "left - bottom")
- rotation_cmd="-rotate 270"
- ;;
+ # "left - bottom")
+ # rotation_cmd="-rotate 270"
+ # ;;
- *)
- rotation_cmd=""
- echo "Unknown orientation \"${orientation}\" !"
- ;;
- esac
+ # *)
+ # rotation_cmd=""
+ # echo "Unknown orientation \"${orientation}\" !"
+ # ;;
+ # esac
if [[ $(file ${i/%.*/}.* | grep -E movie) ]] ; then
CAPTION_PARAMS="-font FreeSans-Bold -pointsize 32 -fill green -annotate +10+32 Video"
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}"
echo "Visited ${NB_SUBDIR} directories."
}
-######################################################################
-# Commits all directories under git
-
-function git-ca () {
- ORIGINAL_PWD=${PWD}
- UNCOMMITTED=""
- for d in $(find ${PWD} -name ".git" | sed -e "s/\.git$//"); do
- cd $d
- NB_MODIFIED=$(git status | grep modified | wc -l)
- if [[ ${NB_MODIFIED} -gt 0 ]]; then
- if [[ $(pwd) =~ ${NO_AUTOMATIC_GIT_COMMIT} ]]; then
- UNCOMMITTED="${UNCOMMITTED} $(pwd)"
+function vcup () {
+ if [[ "$1" ]]; then
+ CURRENT=${PWD}
+ while [[ "$1" ]]; do
+ cd ${CURRENT}
+ cd $1
+ if [[ -d ".git" ]]; then
+ echo "${PWD} is under GIT"
+ git pull
+ elif [[ -d ".svn" ]]; then
+ echo "${PWD} is under SVN"
+ svn update
else
- echo $(pwd)" (${NB_MODIFIED} modified file(s))"
- git commit -a -m "Automatic commit" | grep -v ^#
+ echo "No known versioning system."
fi
- # git gc
- fi
- done
-
- cd ${ORIGINAL_PWD}
-
- if [[ ${UNCOMMITTED} ]]; then
- echo "** WARNING: Did not automatically commit${UNCOMMITTED}"
- fi
-}
-
-######################################################################
-# Backups all git directories into an encrypted backup file located
-# either on the usb key or the SD card (in that order) if they can be
-# mounted.
-
-function git-backup () {
-
- BACKUPDIR=/mnt/key
-
- mount ${BACKUPDIR} 2> /dev/null
-
- if [[ ! $(mount | grep ${BACKUPDIR}) ]]; then
- BACKUPDIR=/mnt/sd
- mount ${BACKUPDIR}
- fi
-
- if [[ $(mount | grep ${BACKUPDIR}) ]]; then
- echo "Mounted ${BACKUPDIR}"
+ shift
+ done
+ cd ${CURRENT}
else
- echo "Could not mount the backup directory"
- return 1
+ vcup .
fi
-
- RESULT=${BACKUPDIR}/gitbackup-$(date +%F-%H%M%S).tgz.mc
-
- tar zcvf - $(find ${HOME}/ -name .git) \
- | mcrypt -f ${HOME}/private/mcrypt.key > ${RESULT}
-
- if [[ -f ${RESULT} ]]; then
- ls -lh ${RESULT}
- else
- echo "Could not create the backup!"
- return 1
- fi
-
- sync
-
- umount ${BACKUPDIR} && echo "Umounted ${BACKUPDIR}"
}
######################################################################
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."
PS1=""
else
-# If the login is a standard one (as specified in
-# IGNORED_PROMPT_LOGIN, which is set in the private bash file), do not
-# show it. I have IGNORED_PROMPT_LOGIN="^fleuret$".
+ # If the login is a standard one (as specified in
+ # IGNORED_PROMPT_LOGIN, which is set in the private bash file), do not
+ # show it. I have IGNORED_PROMPT_LOGIN="^fleuret$".
if [ ! ${IGNORED_PROMPT_LOGIN} ] || [[ ! ${USER} =~ ${IGNORED_PROMPT_LOGIN} ]]; then
IDENT="${USER}"
fi
-# If the display is not the main one, make the assumption that the
-# shell is not running on the localhost, and show the hostname
+ # If the display is not the main one, make the assumption that the
+ # shell is not running on the localhost, and show the hostname
[ "${DISPLAY}" != ":0.0" ] && IDENT="${IDENT}@\h"
-# If there is the login or the hostname, add a ":" to the prompt
+ # If there is the login or the hostname, add a ":" to the prompt
[ "${IDENT}" ] && IDENT="${IDENT}:"
-# If we are root, show that in red
+ # If we are root, show that in red
if [[ ${USER} == "root" ]]; then
PS1="\[${VT_RED_BG}${VT_WHITE_FG}\]${IDENT}\w\[${VT_RESET}\] "
PS1="\[${VT_WHITE_BG}${VT_BLACK_FG}\]${IDENT}\w\[${VT_RESET}\] "
fi
-# In an xterm, show the hostname and path in the title bar, highlight
-# the prompt
+ # In an xterm, show the hostname and path in the title bar, highlight
+ # the prompt
# [ "${TERMS_WITH_BAR}" ] || TERMS_WITH_BAR="^xterm|screen$"
# if [[ "${TERM}" =~ "${TERMS_WITH_BAR}" ]]; then
- # PS1="\[${VT_SET_TITLE}shell@\h (\w)${VT_END_TITLE}${VT_WHITE_BG}\]${IDENT}\w\[${VT_RESET}\] "
+ # PS1="\[${VT_SET_TITLE}shell@\h (\w)${VT_END_TITLE}${VT_WHITE_BG}\]${IDENT}\w\[${VT_RESET}\] "
# else
- # PS1="\[${VT_WHITE_BG}\]${IDENT}\w\[${VT_RESET}\] "
+ # PS1="\[${VT_WHITE_BG}\]${IDENT}\w\[${VT_RESET}\] "
# fi
fi
# 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
######################################################################
# Switch off the history
-alias nh=" export HISTFILE=/dev/null"
-
function histfile_cue () {
if [[ ! "${HISTFILE}" == "${HOME}/.bash_history" ]]; then
HISTORY_CUE="[${HISTFILE}]"
#
# git clone http://fleuret.org/git/finddup/
-# alias finddup='finddup -p0d'
alias finddup='finddup -p'
######################################################################
-# This script grep messages in my mail archives
-
-alias gma='gma.sh'
-
-######################################################################
-# Selector based history
-#
# The selector command is available on my web site
#
# git clone http://fleuret.org/git/selector/
-function selector-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 () {
- 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"'
-
-# M-t appends the selected history line and the end of the current one
-
-bind '"\C-[t":"\C-a\C-kselector-history\C-m\C-a\C-y\C-e"'
+source bash-selector.sh --hist --cd
+######################################################################
# 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}')
lpq
}
+######################################################################
+# A ls with memory to notice what files have been added/removed from
+# the current directory
+
+function lsn () {
+ LSN_MEMORY=".lsn-state"
+ if [[ $1 == "--mem" ]] || [[ "$1" == "-m" ]]; then
+ \ls -pa | sort > ${LSN_MEMORY}
+ echo "State updated." >&2
+ elif [[ -n "$1" ]]; then
+ echo "lsn [--mem|-m]" >&2
+ return 1
+ else
+ if [[ -f ${LSN_MEMORY} ]]; then
+ comm -1 -3 ${LSN_MEMORY} <(\ls -pa | sort)
+ comm -2 -3 ${LSN_MEMORY} <(\ls -pa | sort) | while read line; do
+ echo "${VT_RED_FG}${VT_BOLD}${line}${VT_RESET} (missing)"
+ done
+ else
+ echo "No lsn state here." >&2
+ return 1
+ fi
+ fi
+}
+
######################################################################
function prompt_command () {
-# save the history after every command to avoid loosing some when
-# multiple shells are open
+ # save the history after every command to avoid loosing some when
+ # multiple shells are open
history -a
-# and the local histories system defined above
+ # load the saved history
+ history -n
+ # and the local histories system defined above
keep_local_history
-# and the history cue
+ # and the history cue
histfile_cue
}
projects / scripts.git / blobdiff