From 7d0d106afa93fa5dba16c59fad371c94e0f55af3 Mon Sep 17 00:00:00 2001 From: Francois Fleuret Date: Sat, 15 Nov 2014 23:44:07 +0100 Subject: [PATCH] Update. --- bashrc | 123 +++++++++++++++++++++++++-------------------------- mvdatedir.sh | 8 ++-- 2 files changed, 65 insertions(+), 66 deletions(-) diff --git a/bashrc b/bashrc index 72edf83..b7e3262 100644 --- a/bashrc +++ b/bashrc @@ -48,7 +48,7 @@ shopt -s histappend # 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 @@ -100,11 +100,10 @@ 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 -v' +alias cp='cp -v -i' alias rd=rmdir alias md='mkdir -pv' alias ps='ps uxaf' @@ -123,7 +122,7 @@ function nh () { } function ding () { - if [ $1 ] && which winshepherd.sh; then + if [[ $1 ]] && which winshepherd.sh; then play -q ~/local/sounds/deskbell.wav & unset E_APP_WINDOW winshepherd.sh message green "$1" @@ -134,7 +133,7 @@ function ding () { alias impressive="impressive -s -D 1000 -t Crossfade -T 100" -if [ -e "${HOME}/.dircolors" ]; then +if [[ -e "${HOME}/.dircolors" ]]; then eval $(dircolors "${HOME}/.dircolors") alias ls='ls -p --group-directories-first --color' alias lt='ls -p --color -gohtr --time-style="+%Y %b %d %H:%M"' @@ -171,20 +170,20 @@ function latexdiff () { function rl () { RECENT_LOG=$(ls -t $(find -maxdepth 1 -name "*.log" -type f) | head -1) - if [ ${RECENT_LOG} ]; then + if [[ ${RECENT_LOG} ]]; then FILEBASE="${RECENT_LOG/.log/}" - if [ -f "${FILEBASE}.tex" ]; then + if [[ -f "${FILEBASE}.tex" ]]; then pdflatex "${FILEBASE}" bibtex "${FILEBASE}" pdflatex "${FILEBASE}" pdflatex "${FILEBASE}" - if [ "$1" ]; then - if [ "$1" == "-v" ] || [ "$1" == "--view" ]; then + if [[ "$1" ]]; then + if [[ "$1" == "-v" ]] || [[ "$1" == "--view" ]]; then xpdf "${FILEBASE}.pdf" - elif [ "$1" == "-p" ] || [ "$1" == "--print" ]; then + elif [[ "$1" == "-p" ]] || [[ "$1" == "--print" ]]; then lpr "${FILEBASE}.pdf" else echo "Usage: rl [-v|--view] [-p|--print]" >&2 @@ -212,10 +211,10 @@ function rl () { # http://www.reddit.com/r/linux/comments/2cgu5k/a_handy_little_script_for_interacting_with_your/ function clip () { - if [ -t 0 ] && [ -z "$1" ]; then + if [[ -t 0 ]] && [[ -z "$1" ]]; then # output contents of clipboard xclip -out -selection clipboard || exit 1 - elif [ "$1" ]; then + elif [[ "$1" ]]; then # copy file contents to clipboard xclip -in -selection clipboard < "$1" || exit 1 else @@ -233,7 +232,7 @@ function fn () { } function bak () { - while [ "$1" ]; do + while [[ "$1" ]]; do cp "$1" "$1".bak shift done @@ -241,9 +240,9 @@ function bak () { function ua () { - [ "$1" ] || ( echo "Universal unarchive: ua [ ...]" >&2 && return 1) + [[ "$1" ]] || ( echo "Universal unarchive: ua [ ...]" >&2 && return 1) - while [ "$1" ]; do + while [[ "$1" ]]; do case "$1" in *.tgz|*.tar.gz|*.tbz|*.tar.bz2) @@ -278,13 +277,13 @@ function mcd () { # Capture the screen in a dated png function cap () { - if [ $2 ]; then + if [[ $2 ]]; then name=$2 else 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} @@ -294,8 +293,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 @@ -304,10 +303,10 @@ function cdt () { else dir=$(mktemp -d /tmp/tmp.XXXXXX) link=/tmp/tmp - if [ -h ${link} ]; then + if [[ -h ${link} ]]; then \rm ${link} fi - if [ ! -a ${link} ]; then + if [[ ! -a ${link} ]]; then ln -s ${dir} ${link} fi cd ${dir} @@ -322,9 +321,9 @@ function trash () { mkdir -p ${TRASH} - [ -h ${LINK} ] && \rm ${LINK} + [[ -h ${LINK} ]] && \rm ${LINK} - [ ! -f ${LINK} ] && ln -s ${TRASH} ${LINK} + [[ ! -f ${LINK} ]] && ln -s ${TRASH} ${LINK} mv "$@" ${TRASH} echo "Trashed $@" @@ -343,12 +342,12 @@ function pho () { 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 + [[ "${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} } @@ -357,7 +356,7 @@ function pho () { function dt () { echo "Local: $(date)" - if [ ${TZ} ]; then + if [[ ${TZ} ]]; then unset TZ echo "Home: $(date)" fi @@ -377,9 +376,9 @@ function dt () { function netup () { local upped_wifi - [ "${WIFI_INTERFACE}" ] || WIFI_INTERFACE=wlan0 + [[ "${WIFI_INTERFACE}" ]] || WIFI_INTERFACE=wlan0 - if [ "$1" == "--scan" ]; then + if [[ "$1" == "--scan" ]]; then if ifconfig -s | grep -v -q ${WIFI_INTERFACE}; then sudo ifconfig ${WIFI_INTERFACE} up upped_wifi=1 @@ -387,7 +386,7 @@ function netup () { sudo iwlist ${WIFI_INTERFACE} scan | \grep -E 'ESS|Quali|Encry' | sed -e 's/^[ \t]*//' - if [ ${upped_wifi} ]; then + if [[ ${upped_wifi} ]]; then sudo ifconfig ${WIFI_INTERFACE} down unset upped_wifi fi @@ -410,7 +409,7 @@ function netup () { return 1 fi - if [ ! "$@" ] && [ -s ${NETUP_HISTORY} ]; then + if [[ ! "$@" ]] && [[ -s ${NETUP_HISTORY} ]]; then echo "netup " >&2 return 1 # # If we have no argument and there is a .netup_history, use it @@ -421,7 +420,7 @@ function netup () { echo ${ARGS} > ${NETUP_HISTORY} fi - if [ "${PRIVATE_INTERFACE_DEFINITION}" ]; then + if [[ "${PRIVATE_INTERFACE_DEFINITION}" ]]; then ARGS="-i ${PRIVATE_INTERFACE_DEFINITION} ${ARGS}" fi @@ -434,14 +433,14 @@ function netup () { 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 + if [[ -x ${REMOVE_LOCAL_DNS} ]]; then echo "Executing ${VT_GREEN_FG}[sudo ${REMOVE_LOCAL_DNS} 192.168]${VT_RESET}" sudo ${REMOVE_LOCAL_DNS} 192.168 fi } function netdown () { - if [ ! "$@" ] && [ -s ${NETUP_HISTORY} ]; then + if [[ ! "$@" ]] && [[ -s ${NETUP_HISTORY} ]]; then # If there are no arguments and there is a .netup_history, get the # interface from it ARGS=$(tail -1 ${NETUP_HISTORY} | sed -e "s/=.*$//") @@ -450,7 +449,7 @@ function netdown () { ARGS="$@" fi - [ "${PRIVATE_INTERFACE_DEFINITION}" ] && ARGS="-i ${PRIVATE_INTERFACE_DEFINITION} ${ARGS}" + [[ "${PRIVATE_INTERFACE_DEFINITION}" ]] && ARGS="-i ${PRIVATE_INTERFACE_DEFINITION} ${ARGS}" echo "Executing sudo ${VT_GREEN_FG}[ifdown ${ARGS}]${VT_RESET}" sudo ifdown ${ARGS} @@ -468,7 +467,7 @@ function netdown () { function checkgw () { GW=$(route -n | grep ^0.0.0.0 | awk '{print $2}') - if [ "${GW}" ]; then + if [[ "${GW}" ]]; then ping ${GW} else echo "Can not find a getaway." >&2 @@ -499,7 +498,7 @@ function setxtermbg () { function shuffle () { SEED=$1 - [ $SEED ] || SEED=0 + [[ $SEED ]] || SEED=0 awk 'BEGIN{srand('${SEED}')} { print rand()" "$0 }' | sort -g | sed -e "s/^[0-9\.e\-]* //" } @@ -509,15 +508,15 @@ function shuffle () { KEPT_COMMANDS=${HOME}/.kept_bash_commands function keep () { - if [ ${KEPT_COMMANDS} ]; then + if [[ ${KEPT_COMMANDS} ]]; then TOKEEP=$(mktemp /tmp/keep.XXXXXX) - if [ "$*" ]; then + if [[ "$*" ]]; then echo "$*" > ${TOKEEP} else selector -b -i -d -l ${HISTSIZE} -o "${TOKEEP}" <(history) fi - if [ -s "${TOKEEP}" ]; then + if [[ -s "${TOKEEP}" ]]; then echo $(date)": "$(cat ${TOKEEP}) >> ${KEPT_COMMANDS} cat "${TOKEEP}" else @@ -535,16 +534,16 @@ function keep () { function burn () { DEVICE="/dev/cdrw1" - if [ ! "$1" ]; then + if [[ ! "$1" ]]; then echo "burn " >&2 - elif [ -f "$1" ]; then + elif [[ -f "$1" ]]; then if [[ $(file "$1" | \grep -E 'ISO 9660|UDF filesystem data') ]]; then wodim -eject -v dev=${DEVICE} "$1" else echo "Do not know what to do with $1" >&2 fi - elif [ -d "$1" ]; then - [ "${TMP_ROOT}" ] || TMP_ROOT=/tmp/ + 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" && \ @@ -568,7 +567,7 @@ function dvd () { echo " / * Volume" echo - if [ "$1" ]; then + if [[ "$1" ]]; then dvd_device="$1" shift else @@ -577,7 +576,7 @@ function dvd () { title="1" - if [ "$1" ]; then + if [[ "$1" ]]; then title=$1 shift fi @@ -593,9 +592,9 @@ function dvd () { } function ripdvd () { - if [ -e "/dev/dvd" ]; then + if [[ -e "/dev/dvd" ]]; then DVD_DEVICE="/dev/dvd" - elif [ -e "/dev/dvd3" ]; then + elif [[ -e "/dev/dvd3" ]]; then DVD_DEVICE="/dev/dvd3" else echo "Can not find the dvd device." >&2 @@ -628,11 +627,11 @@ function mksmall () { DEST_DIR=$1 - [ ${DEST_DIR} ] || DEST_DIR=./small + [[ ${DEST_DIR} ]] || DEST_DIR=./small mkdir -p ${DEST_DIR} - if [ ! -d ${DEST_DIR} ]; then + if [[ ! -d ${DEST_DIR} ]]; then echo "Can not create ${DEST_DIR}" >&2 return fi @@ -642,7 +641,7 @@ function mksmall () { for i in $(find -maxdepth 1 -type f); do if [[ $(file $i | grep image) ]]; then - if [ -e ${DEST_DIR}/$i ]; then + if [[ -e ${DEST_DIR}/$i ]]; then echo "The file ${DEST_DIR}/$i already exists." else if [[ $(file ${i/%.*/}.* | grep -E movie) ]] ; then @@ -683,7 +682,7 @@ function mvtoconfig () { export PS1 -if [ "${CONSOLE}" == "yes" ]; then +if [[ "${CONSOLE}" == "yes" ]]; then PS1="" else @@ -691,18 +690,18 @@ else # 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" + [[ "${DISPLAY}" != ":0.0" ]] && IDENT="${IDENT}@\h" # If there is the login or the hostname, add a ":" to the prompt - [ "${IDENT}" ] && IDENT="${IDENT}:" + [[ "${IDENT}" ]] && IDENT="${IDENT}:" # If we are root, show that in red @@ -715,7 +714,7 @@ else # In an xterm, show the hostname and path in the title bar, highlight # the prompt - # [ "${TERMS_WITH_BAR}" ] || TERMS_WITH_BAR="^xterm|screen$" + # [[ "${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}\] " @@ -822,7 +821,7 @@ function lsn () { sort -u ${TMP} > ${LSN_MEMORY} \rm ${TMP} - elif [ "$1" ]; then + elif [[ "$1" ]]; then echo "lsn [--mem|-m] [+ ...]" >&2 return 1 diff --git a/mvdatedir.sh b/mvdatedir.sh index e833782..73fcf87 100755 --- a/mvdatedir.sh +++ b/mvdatedir.sh @@ -24,12 +24,12 @@ set -e while [[ "$1" ]]; do - if [[ -f "$1" ]]; then + # if [[ -f "$1" ]]; then dir=$(date -r "$1" +%Y/%b) mkdir -v -p ${dir} mv -v "$1" ${dir} - else - echo "Ignore: $1 is not a regular file." - fi + # else + # echo "Ignore: $1 is not a regular file." + # fi shift done -- 2.20.1