# If the MANPATH is not set, set it
-[ "${MANPATH}" ] || MANPATH=$(manpath)
+[[ "${MANPATH}" ]] || MANPATH=$(manpath)
# If the private bashrc exists, execute it
-[ -f "${PRIVATE_BASHRC}" ] && source "${PRIVATE_BASHRC}"
+[[ -f "${PRIVATE_BASHRC}" ]] && source "${PRIVATE_BASHRC}"
# !!! THIS HAS TO BE HERE EVEN IN THE NON-INTERACTIVE PART OR YOU WILL
# LOSE YOU PREVIOUS HISTORY !!!
# interactive mode. This should maybe be done more properly through
# using different .bash_profile and .bash_login
-[[ ${TERM} == "dumb" ]] || [ ! -t 0 ] && return
+[ ${TERM} == "dumb" ] || [[ ! -t 0 ]] && return
+
+# Remove the annoying beeps in console
+
+# setterm -blength 0
+
+# || setterm --blength 0 # Seriously?
######################################################################
## The interactive part
export LESS_TERMCAP_md=${VT_BLUE_FG}${VT_BOLD}
export LESS_TERMCAP_me=${VT_RESET}
+# I do not like to clutter my home with history files
+
+export LESSHISTFILE=/dev/null
+
# 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 rm='rm -v -i'
+alias mv='mv -v -i'
alias chmod='chmod -c'
-alias cp='cp -i'
+alias cp='cp -v -i'
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 df='df -hT'
+# alias df='df -hT --sync'
+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
-# alias kj="keyjnote -s -D 1000 -t Crossfade -T 100"
-alias impressive="impressive -s -D 1000 -t Crossfade -T 100"
+alias p='feh --force-aliasing -d --full-screen --auto-zoom'
-# alias fdupes='fdupes -r .'
+function nh () {
+ export HISTFILE=/dev/null
+ unalias cd
+}
-# ls colors
+function select-tz () {
+ # Select a value for TZ
+ TMP=$(mktemp /tmp/select-tz.XXXXXX)
+ selector -o "${TMP}" <(grep -v ^# /usr/share/zoneinfo/zone.tab | awk '{print $3}' | sort -u)
+ cat "${TMP}"
+ \rm -f "${TMP}"
+}
-if [ -e "${HOME}/.dircolors" ]; then
+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 impressive="impressive -s -D 1000 -t Crossfade -T 100"
+
+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 lll='ls --color -lth'
- 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 lll='ls -lth'
- 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;41m' -x $'\033[0m' \
+ -y $'\033[30;42m' -z $'\033[0m' \
+ "$@"
+}
+
+# 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)
+
+ RECENT_LOG=$(ls -t *.log | 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
+# http://www.reddit.com/r/linux/comments/2cgu5k/a_handy_little_script_for_interacting_with_your/
+function clip () {
+ if [[ -t 0 ]] && [[ -z "$1" ]]; then
+ # output contents of clipboard
+ xclip -out -selection clipboard || exit 1
+ elif [[ "$1" ]]; then
+ # copy file contents to clipboard
+ xclip -in -selection clipboard < "$1" || exit 1
+ else
+ # copy stdin to clipboard
+ xclip -in -selection clipboard <&0 || exit 1
+ fi
+}
+
+# Find a file whose name contains a substring
function fn () {
name=$1
find "$@" -name "*${name}*";
}
+function bak () {
+ while [[ "$1" ]]; do
+ cp "$1" "$1".bak
+ shift
+ done
+}
+
+function scan () {
+ n=1
+
+ while [[ -f "${HOME}/scan-${n}.jpg" ]]; do
+ n=$((n+1))
+ done
+
+ while [[ "$1" ]]; do
+ if [[ "$1" == "color" ]]; then
+ OPTS+=" --mode Color"
+ elif [[ "$1" == "gray" ]]; then
+ OPTS+=" --mode Gray"
+ elif [[ "$1" == "a4crop" ]]; then
+ OPTS+=" -l 5 -t 0 -x 200 -y 290"
+ else
+ echo "Unknown argument \`$1'"
+ fi
+ shift
+ done
+
+ echo "**"
+ echo "** Scanning to ${HOME}/scan-${n}.jpg"
+ echo "**"
+
+ SCANNER=$(scanimage -L | grep "Canon LiDE 60" | sed -e "s/^.*\`\(.*\)'.*$/\1/")
+
+ scanimage -d ${SCANNER} \
+ --format=pnm \
+ --mode=color \
+ --depth=8 \
+ -v \
+ --resolution=300 \
+ ${OPTS} | \
+ convert -rotate 180 - "${HOME}/scan-${n}.jpg"
+
+ echo "** Done".
+}
+
+# A password generator
+
+function genpw () {
+ tr -dc A-Za-z0-9 < /dev/urandom | head -c16
+ # tr -dc [:graph:] < /dev/urandom | head -c16
+ echo
+}
+
+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 () {
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 a='cd /tmp/at'
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 $@"
-}
+ TRASH=$(date +/tmp/trash-${USER}-%Y-%b-%d-%Hh)
+ LINK=/tmp/trash
-# alias trash=trash.sh
+ mkdir -p ${TRASH}
-function mmsget () {
- mplayer "$1" -dumpstream -dumpfile $(basename "$1")
-}
+ [[ -h ${LINK} ]] && \rm ${LINK}
-######################################################################
-# http://www.reddit.com/r/linux/comments/akt3j/a_functional_programming_style_map_function_for/
+ [[ ! -f ${LINK} ]] && ln -s ${TRASH} ${LINK}
-function map () {
- local command i rep
- if [ $# -lt 2 ] || [[ ! "$@" =~ :[[:space:]] ]];then
- echo "Invalid syntax." >&2; return 1
- fi
- until [[ "$1" =~ : ]]; do
- command="$command $1"; shift
- done
- command="$command ${1%:}"; shift
- for i in "$@"; do
- if [[ $command =~ \{\} ]];then
- rep="${command//\{\}/\"$i\"}"
- eval "${rep//\\/\\\\}"
- else
- eval "${command//\\/\\\\} \"${i//\\/\\\\}\""
- fi
- done
+ mv "$@" ${TRASH}
+ echo "Trashed $@"
}
######################################################################
## 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
function dt () {
- echo "Local: $(date)"
- if [[ ${TZ} ]]; then
- unset TZ
- echo "Home: $(date)"
- fi
+ echo "Local - $(date)"
+ unset TZ
+ echo "Home - $(date)"
}
######################################################################
## 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
-[[ ${NETUP_HISTORY} ]] || NETUP_HISTORY="${HOME}/.netup_history"
-
-alias ifup="echo Try netup"
-alias ifdown="echo Try netdown"
+[ ${NETUP_HISTORY} ] || NETUP_HISTORY="${HOME}/.netup_history"
function netup () {
+ local upped_wifi
+
+ [[ "${WIFI_INTERFACE}" ]] || WIFI_INTERFACE=wlan0
+
+ if [[ "$1" == "--scan" ]]; then
+ if ifconfig -s | grep -v -q ${WIFI_INTERFACE}; then
+ sudo ifconfig ${WIFI_INTERFACE} up
+ upped_wifi=1
+ fi
+
+ sudo iwlist ${WIFI_INTERFACE} scan | \grep -E 'ESS|Quali|Encry' | sed -e 's/^[ \t]*//'
+
+ if [[ ${upped_wifi} ]]; then
+ sudo ifconfig ${WIFI_INTERFACE} down
+ unset upped_wifi
+ fi
+
+ return 0
+ fi
+
+ if \ifconfig -s | grep -q -v ^'(Iface|lo) '; then
+ echo "There is/are already interface(s) up." >&2
+ return 1
+ fi
+
+ if \ps h -C dhclient | grep -q .; then
+ echo "There is already a dhcp client running." >&2
+ return 1
+ fi
+
+ if \ps h -C wpa_supplicant | grep -q .; then
+ echo "There is already a wpa_supplicant running." >&2
+ return 1
+ fi
+
if [[ ! "$@" ]] && [[ -s ${NETUP_HISTORY} ]]; then
- # If we have no argument and there is a .netup_history, use it
- ARGS=$(cat ${NETUP_HISTORY})
+ 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
- echo "${VT_GREEN_FG}Running [sudo ifup ${ARGS}]${VT_RESET}"
+ if [[ "${PRIVATE_INTERFACE_DEFINITION}" ]]; then
+ ARGS="-i ${PRIVATE_INTERFACE_DEFINITION} ${ARGS}"
+ fi
+
+ 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
}
# Otherwise, use the standard ifdown
ARGS="$@"
fi
- echo "${VT_GREEN_FG}Running sudo [ifdown ${ARGS}]${VT_RESET}"
+
+ [[ "${PRIVATE_INTERFACE_DEFINITION}" ]] && ARGS="-i ${PRIVATE_INTERFACE_DEFINITION} ${ARGS}"
+
+ 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 [[ "${GW}" ]]; then
+ ping ${GW}
+ else
+ echo "Can not find a getaway." >&2
+ return 1
+ fi
}
######################################################################
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; }
-
######################################################################
# You can change the xterm background color on the fly!
function keep () {
if [[ ${KEPT_COMMANDS} ]]; then
- LINE=$(history | tail -2 | head -1 | sed -e "s/^[0-9 ]*//")
- echo $LINE
- echo $(date)": "${LINE} >> ${KEPT_COMMANDS}
+ TOKEEP=$(mktemp /tmp/keep.XXXXXX)
+ if [[ "$@" ]]; then
+ echo "$@" > ${TOKEEP}
+ else
+ selector -b -i -d -l ${HISTSIZE} -o "${TOKEEP}" <(history)
+ fi
+
+ if [[ -s "${TOKEEP}" ]]; then
+ echo $(date)": "$(cat ${TOKEEP}) >> ${KEPT_COMMANDS}
+ cat "${TOKEEP}"
+ else
+ echo "No command stored!"
+ fi
+
+ \rm ${TOKEEP}
else
echo "You have to set \$KEPT_COMMANDS"
fi
# I sometime burn CDs and DVDs
function burn () {
- set -e
- DEVICE="/dev/cdrw"
+ [[ "${DEV_BURNER}" ]] || DEV_BURNER="/dev/sr0"
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
+ if [[ $(file "$1" | \grep -E 'ISO 9660|UDF filesystem data') ]]; then
+ wodim -eject -v dev=${DEV_BURNER} "$1"
else
- echo "Unknown type of $1" >&2
+ echo "Do not know what to do with $1" >&2
fi
elif [[ -d "$1" ]]; then
- TMP=$(mktemp /tmp/cdimage.XXXXXX) && \
+ [[ "${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}
+ wodim -eject -v dev=${DEV_BURNER} ${TMP}
rm -f ${TMP}
else
echo "Can not find $1" >&2
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
dvd_device="$1"
shift
else
- dvd_device="/dev/cdrom"
+ dvd_device="/dev/dvd"
fi
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} ${MPLAYER_OPTIONS} dvd://${title}
}
function ripdvd () {
- mkdir -p ${HOME}/dvds
- cd ${HOME}/dvds
- time dvdbackup -v -M && eject
-}
-
-######################################################################
-# Upload the sources from the current directory to work
-
-function ulsrc () {
- if [[ ! "${MY_WORK_MACHINE}" ]]; then
- echo "\$MY_WORK_MACHINE undefined" 1>&2
+ 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
- DIR=${PWD/$HOME\//}
+ echo "Attemptin to rip from ${DVD_DEVICE}."
- scp {Makefile,*.{cc,h,sh}} ${MY_WORK_MACHINE}:${DIR}
+ mkdir -p ${HOME}/dvds
- echo "Uploaded to ${MY_WORK_MACHINE}:${DIR}/"
+ cd ${HOME}/dvds
+ time dvdbackup -i ${DVD_DEVICE} -v -M "$@" && eject
}
+alias ripcd=abcde
+
######################################################################
# Create small images from images
function mksmall () {
- PARAMS="-geometry 800x600"
+ if [[ "$1" == "--params" ]]; then
+ shift
+ PARAMS="$1"
+ shift
+ fi
+
+ [[ "${PARAMS}" ]] || PARAMS="-geometry 1280x1024"
# Auto-orient does not seem to work at all, hence the ugly hack
# with exif below
if [[ -e ${DEST_DIR}/$i ]]; then
echo "The file ${DEST_DIR}/$i already exists."
else
-
- orientation=$(exif $i \
- | grep ^Orientation \
- | head -1 \
- | sed -e "s/^[^|]*|//" \
- | sed -e "s/ *$//")
-
- case ${orientation} in
- ""|"top - left")
- rotation_cmd=""
- ;;
-
- "right - top")
- rotation_cmd="-rotate 90"
- ;;
-
- "left - bottom")
- rotation_cmd="-rotate 270"
- ;;
-
- *)
- 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"
else
fi
}
-######################################################################
-# Track uncommited files (I presume this is very ugly from a real git
-# user perspective)
-
-function git-fm () {
- CURRENT_DIR=$(pwd)
- NB_SUBDIR=0
-
- for i in $(find -name ".git"); do
- NB_SUBDIR=$((NB_SUBDIR+1))
- cd ${CURRENT_DIR}/$(dirname $i)
- NB_MODIFIED=$(git status | grep modified | wc -l)
- if [[ ${NB_MODIFIED} -gt 0 ]]; then
- echo "$(dirname $i) (${NB_MODIFIED})"
- git status | grep modified \
- | sed -e "s/^#\t/ /" | sed -e "s/modified: *//"
- fi
- done
-
- cd ${CURRENT_DIR}
-
- 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)"
- else
- echo $(pwd)" (${NB_MODIFIED} modified file(s))"
- git commit -a -m "Automatic commit" | grep -v ^#
- 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}"
- else
- echo "Could not mount the backup directory"
- return 1
- 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}"
-}
-
-######################################################################
-# Downloads torrents located in ${BT_DIR}/torrents/ and puts the
-# result in the ${BT_DIR}
-
-function bt () {
- if [[ ${BT_DIR} ]]; then
- if [[ -d "${BT_DIR}/torrents" ]]; then
- if [[ "$1" ]]; then
- mv "$1" ${BT_DIR}/torrents
- fi
- if [[ "$(ps auxwww | grep btlaunchmanycurses | grep -v grep)" ]]; then
- echo "A client is already running."
- else
- cd ${BT_DIR} && screen btlaunchmanycurses torrents --max_upload_rate 32
- fi
- else
- echo "Directory ${BT_DIR}/torrents does not exist."
- fi
- else
- echo "You have to set \$BT_DIR."
- fi
-}
-
######################################################################
# The complex prompt policy
export PS1
-if [ "${CONSOLE}" == "yes" ]; then
+if [[ "${CONSOLE}" == "yes" ]]; then
+
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
+ 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
-
- [ "${DISPLAY}" != ":0.0" ] && IDENT="${IDENT}@\h"
+ # 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 there is the login or the hostname, add a ":" to the prompt
+ [[ "${DISPLAY}" != ":0.0" ]] && IDENT="${IDENT}@\h"
- [ "${IDENT}" ] && IDENT="${IDENT}:"
+ # If there is the login or the hostname, add a ":" to the prompt
-# If we are root, show that in red
+ [[ "${IDENT}" ]] && IDENT="${IDENT}:"
if [[ ${USER} == "root" ]]; then
+ # If we are root, show that in red
PS1="\[${VT_RED_BG}${VT_WHITE_FG}\]${IDENT}\w\[${VT_RESET}\] "
else
- PS1="\[${VT_WHITE_BG}${VT_BLACK_FG}\]${IDENT}\w\[${VT_RESET}\] "
+ if [[ $(\grep QEMU /proc/cpuinfo) ]]; then
+ # If we are in a qemu virtual machine, in yellow
+ PS1="\[${VT_YELLOW_BG}${VT_BLACK_FG}\]${IDENT}\w\[${VT_RESET}\] "
+ else
+ # Otherwise in white
+ PS1="\[${VT_WHITE_BG}${VT_BLACK_FG}\]${IDENT}\w\[${VT_RESET}\] "
+ fi
fi
-# 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}\] "
- # else
- # PS1="\[${VT_WHITE_BG}\]${IDENT}\w\[${VT_RESET}\] "
- # fi
-
fi
+PS1="${PSCUE}${PS1}"
+
######################################################################
# This implements a local history. If we are in a directory containing
# a writable local history file, we add the last line of the global
PS1="\[${VT_WHITE_BG}\]\${LOCAL_HISTORY_HINT}\[${VT_RESET}\]${PS1}"
######################################################################
-# Switch off the history
+# Show the history path if it is unusual
function histfile_cue () {
if [[ ! "${HISTFILE}" == "${HOME}/.bash_history" ]]; then
#
# git clone http://fleuret.org/git/finddup/
-# alias finddup='finddup -p0d'
alias finddup='finddup -p'
######################################################################
-# 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)
-}
+export SELECTOR_CD_HISTORY_SIZE=10000
-# Find pathes in the history and make a list of the existing ones
+source bash-selector.sh --hist --cd
-export CD_HISTORY=${HOME}/.selector-cd-history
+######################################################################
+# And we avoid to put in the history the use of the selector, which we
+# do too often
-function selector-cd () {
- 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
- if [[ -z "$1" ]]; then
- cd
- else
- cd "$1"
- fi
- echo $PWD | sed -e "s|${HOME}|~|" >> ${CD_HISTORY}
- fi
+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
}
-alias cd=selector-cd
-alias cdd="cd $(tail -1 ${CD_HISTORY})"
+######################################################################
+# A ls with memory to notice what files have been added/removed from
+# the current directory
-# M-c provides a dynamic list of directories to cd into
+function lsn () {
+ [[ "${LSN_STATE_FILE}" ]] || LSN_STATE_FILE=".lsn-state"
-bind '"\C-[c":"\C-a\C-kselector-cd +\C-m"'
+ if [[ $1 == "--mem" ]] || [[ "$1" == "-m" ]]; then
-# 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}
-# }
+ \ls -pa | sort > "${LSN_STATE_FILE}"
+ echo "State updated." >&2
-# M-r puts the selected history line in place of the current one
+ elif [[ $1 == "+" ]]; then
-bind '"\C-[r":"\C-a\C-kselector-history\C-m"'
+ shift
-# M-t appends the selected history line and the end of the current one
+ TMP=$(mktemp /tmp/lsn.XXXXXX)
+ \ls -d "$@" > ${TMP}
+ cat "${LSN_STATE_FILE}" >> ${TMP}
+ sort ${TMP} | uniq -u > "${LSN_STATE_FILE}"
+ \rm ${TMP}
-bind '"\C-[t":"\C-a\C-kselector-history\C-m\C-a\C-y\C-e"'
+ elif [[ "$1" ]]; then
+ cat >&2 <<EOF
+lsn [--help|-h] [--mem|-m] [+ <file> ...]
-# And we avoid to put in the history the use of the selector, which we
-# do too often
+Where
-HISTIGNORE="${HISTIGNORE}:selector-history"
+ --help|-h
+ prints this help
-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
+ --mem|-m
+ stores the current state of the directory
+
+ + <file> [<file> ...]
+ switches the presence/absence of the indicated files in the
+ stored state
+
+EOF
+ if [[ ! "$1" == "-h" ]] && [[ ! "$1" == "--help" ]]; then
+ echo >&2 "Unknown option \`\`$1''."
+ return 1
+ fi
+
+ else
+
+ if [[ -f "${LSN_STATE_FILE}" ]]; then
+ TMP=$(mktemp /tmp/lsn.XXXXXX)
+ \ls -pa | sort > ${TMP}
+ if diff > /dev/null ${TMP} "${LSN_STATE_FILE}"; then
+ echo "${VT_GREEN_FG}${VT_BOLD}No change (since $(date +"%b %d, %Y" -r "${LSN_STATE_FILE}"))${VT_RESET}"
+ else
+ \comm -1 -3 "${LSN_STATE_FILE}" ${TMP}
+ \comm -2 -3 "${LSN_STATE_FILE}" ${TMP} | while read line; do
+ echo "${VT_RED_FG}${VT_BOLD}${line}${VT_RESET} (missing)"
+ done
+ fi
+ \rm ${TMP}
+ else
+ echo "${VT_RED_FG}${VT_BOLD}No lsn state here.${VT_RESET}" >&2
+ return 1
+ fi
+
+ fi
}
######################################################################
function prompt_command () {
-# save the history after every command to avoid loosing some when
-# multiple shells are open
+ # if [[ ! "${CORE_CHECK_PWD}" == ${PWD} ]] && [[ $(find . -maxdepth 1 -name "core__*" -print -quit) ]]; then
+
+ [[ "${CORE_CHECK_PWD}" == ${PWD} ]] || find . -maxdepth 1 -name "core__*"
+ CORE_CHECK_PWD=${PWD}
+
+ # if [[ $(umask) != 0022 ]]; then
+ # echo "Umask changed to $(umask)"
+ # fi
+ # 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
}
# Displaying the timezone if it is set
-if [[ ${TZ} ]]; then
- echo "${VT_BOLD}${VT_GREEN_FG}Time zone is ${TZ}.${VT_RESET}"
-fi
+[[ ${TZ} ]] && echo "${VT_BLUE_FG}Time zone is ${TZ}.${VT_RESET}"
######################################################################