From: Francois Fleuret Date: Mon, 31 Jul 2017 22:34:40 +0000 (+0200) Subject: Cosmetics. X-Git-Url: https://fleuret.org/cgi-bin/gitweb/gitweb.cgi?a=commitdiff_plain;h=715b46d9325d15fc04870c057ce67bf88138b545;p=scripts.git Cosmetics. --- diff --git a/bashrc b/bashrc index b9cefb4..20cb77d 100644 --- a/bashrc +++ b/bashrc @@ -137,7 +137,8 @@ function select-tz () { } 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" @@ -148,7 +149,8 @@ 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"' @@ -187,20 +189,25 @@ function rl () { RECENT_LOG=$(ls -t *.log | 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 --shell-escape "${FILEBASE}" bibtex "${FILEBASE}" pdflatex --shell-escape "${FILEBASE}" pdflatex --shell-escape "${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 @@ -228,10 +235,12 @@ 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 @@ -249,7 +258,8 @@ function fn () { } function bak () { - while [[ "$1" ]]; do + while [[ "$1" ]] + do cp "$1" "$1".bak shift done @@ -258,18 +268,24 @@ function bak () { function scan () { n=1 - while [[ -f "${HOME}/scan-${n}.jpg" ]]; do + while [[ -f "${HOME}/scan-${n}.jpg" ]] + do n=$((n+1)) done - while [[ "$1" ]]; do - if [[ "$1" == "color" ]]; then + while [[ "$1" ]] + do + if [[ "$1" == "color" ]] + then OPTS+=" --mode Color" - elif [[ "$1" == "gray" ]]; then + elif [[ "$1" == "gray" ]] + then OPTS+=" --mode Gray" - elif [[ "$1" == "a4crop" ]]; then + elif [[ "$1" == "a4crop" ]] + then OPTS+=" -l 5 -t 0 -x 200 -y 300" - elif [[ "$1" == "help" ]] || [[ "$1" == "-h" ]] || [[ "$1" == "--help" ]]; then + elif [[ "$1" == "help" ]] || [[ "$1" == "-h" ]] || [[ "$1" == "--help" ]] + then echo "$0 [color|gray] [a4crop]" && return 0 else echo "Unknown argument \`$1'" @@ -307,7 +323,8 @@ function ua () { [[ "$1" ]] || ( echo "Universal unarchive: ua [ ...]" >&2 && return 1) - while [[ "$1" ]]; do + while [[ "$1" ]] + do case "$1" in *.tgz|*.tar.gz|*.tbz|*.tar.bz2) @@ -342,13 +359,21 @@ 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" + + if [[ "$1" ]] + then + echo "Waiting $1 s and saving to ${name}." + sleep "$1" + else + echo "Saving to ${name}." + fi + echo "Please click on the window to capture." xwd | convert - ${name} \ls -l ${name} @@ -358,8 +383,10 @@ 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 @@ -368,10 +395,12 @@ 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} @@ -442,15 +471,18 @@ function netup () { [[ "${WIFI_INTERFACE}" ]] || WIFI_INTERFACE=wlan0 - if [[ "$1" == "--scan" ]]; then - if ifconfig -s | grep -v -q ${WIFI_INTERFACE}; then + 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 + if [[ ${upped_wifi} ]] + then sudo ifconfig ${WIFI_INTERFACE} down unset upped_wifi fi @@ -458,22 +490,26 @@ function netup () { return 0 fi - if \ifconfig -s | grep -q -v ^'(Iface|lo) '; then + 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 + 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 + 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 [[ ! "$@" ]] && [[ -s ${NETUP_HISTORY} ]] + then echo "netup " >&2 return 1 # # If we have no argument and there is a .netup_history, use it @@ -484,7 +520,8 @@ function netup () { echo ${ARGS} > ${NETUP_HISTORY} fi - if [[ "${PRIVATE_INTERFACE_DEFINITION}" ]]; then + if [[ "${PRIVATE_INTERFACE_DEFINITION}" ]] + then ARGS="-i ${PRIVATE_INTERFACE_DEFINITION} ${ARGS}" fi @@ -497,14 +534,16 @@ 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/=.*$//") @@ -518,12 +557,14 @@ function netdown () { echo "Executing sudo ${VT_GREEN_FG}[ifdown ${ARGS}]${VT_RESET}" sudo ifdown ${ARGS} - # if [[ $(\ps -C dhclient | tail -n +2) ]]; then + # 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 + # if [[ $(\ps -C wpa_supplicant | tail -n +2) ]] + # then # echo "There is still a wpa_supplicant running." >&2 # return 1 # fi @@ -531,7 +572,8 @@ 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 @@ -572,15 +614,18 @@ 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 @@ -598,15 +643,19 @@ function keep () { function burn () { [[ "${DEV_BURNER}" ]] || DEV_BURNER="/dev/sr0" - if [[ ! "$1" ]]; then + if [[ ! "$1" ]] + then echo "burn " >&2 - elif [[ -f "$1" ]]; then - if [[ $(file "$1" | \grep -E 'ISO 9660|UDF filesystem data') ]]; then + elif [[ -f "$1" ]] + then + if [[ $(file "$1" | \grep -E 'ISO 9660|UDF filesystem data') ]] + then wodim -eject -v dev=${DEV_BURNER} "$1" else echo "Do not know what to do with $1" >&2 fi - elif [[ -d "$1" ]]; then + elif [[ -d "$1" ]] + then [[ "${TMP_ROOT}" ]] || TMP_ROOT=/tmp/ echo "Using ${TMP_ROOT} as temporary directory." TMP=$(mktemp ${TMP_ROOT}/cdimage.XXXXXX) && \ @@ -631,7 +680,8 @@ function dvd () { echo " / * Volume" echo - if [[ "$1" ]]; then + if [[ "$1" ]] + then dvd_device="$1" shift else @@ -640,7 +690,8 @@ function dvd () { title="1" - if [[ "$1" ]]; then + if [[ "$1" ]] + then title=$1 shift fi @@ -656,9 +707,11 @@ 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 @@ -680,7 +733,8 @@ alias ripcd=abcde function mksmall () { - if [[ "$1" == "--params" ]]; then + if [[ "$1" == "--params" ]] + then shift PARAMS="$1" shift @@ -701,7 +755,8 @@ function mksmall () { mkdir -p ${DEST_DIR} - if [[ ! -d ${DEST_DIR} ]]; then + if [[ ! -d ${DEST_DIR} ]] + then echo "Can not create ${DEST_DIR}" >&2 return fi @@ -709,12 +764,16 @@ function mksmall () { NB_TOTAL=$(find -maxdepth 1 -type f | wc -l) NB=0 - for i in $(find -maxdepth 1 -type f); do - if [[ $(file $i | grep image) ]]; then - if [[ -e ${DEST_DIR}/$i ]]; then + for i in $(find -maxdepth 1 -type f) + do + if [[ $(file $i | grep image) ]] + then + if [[ -e ${DEST_DIR}/$i ]] + then echo "The file ${DEST_DIR}/$i already exists." else - if [[ $(file ${i/%.*/}.* | grep -E movie) ]] ; then + if [[ $(file ${i/%.*/}.* | grep -E movie) ]] + then CAPTION_PARAMS="-font FreeSans-Bold -pointsize 32 -fill green -annotate +10+32 Video" else CAPTION_PARAMS="" @@ -738,7 +797,8 @@ function mksmall () { function mvtoconfig () { CONFIGDIR=${HOME}/sources/config - if [[ -d ${CONFIGDIR} ]]; then + if [[ -d ${CONFIGDIR} ]] + then NEWNAME=${CONFIGDIR}/$(basename "$1" | sed -e "s/^\.//") mv "$1" $NEWNAME ln -s $NEWNAME $1 @@ -752,7 +812,8 @@ function mvtoconfig () { export PS1 -if [[ "${CONSOLE}" == "yes" ]]; then +if [[ "${CONSOLE}" == "yes" ]] +then PS1="" @@ -762,7 +823,8 @@ 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 @@ -775,11 +837,13 @@ else [[ "${IDENT}" ]] && IDENT="${IDENT}:" - if [[ ${USER} == "root" ]]; then + if [[ ${USER} == "root" ]] + then # If we are root, show that in red PS1="\[${VT_RED_BG}${VT_WHITE_FG}\]${IDENT}\w\[${VT_RESET}\] " else - if [[ $(\grep QEMU /proc/cpuinfo) ]]; then + 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 @@ -800,7 +864,8 @@ PS1="${PSCUE}${PS1}" LOCAL_HISTORY_FILE=".local_bash_history" function keep_local_history () { - if [[ -w "${LOCAL_HISTORY_FILE}" ]]; then + if [[ -w "${LOCAL_HISTORY_FILE}" ]] + then history 1 | sed -e 's/^ *[0-9]* *//' >> ${LOCAL_HISTORY_FILE} TMP=$(mktemp /tmp/lh.XXXXXX) \chmod 600 ${TMP} @@ -820,7 +885,8 @@ PS1="\[${VT_WHITE_BG}\]\${LOCAL_HISTORY_HINT}\[${VT_RESET}\]${PS1}" # Show the history path if it is unusual function histfile_cue () { - if [[ ! "${HISTFILE}" == "${HOME}/.bash_history" ]]; then + if [[ ! "${HISTFILE}" == "${HOME}/.bash_history" ]] + then HISTORY_CUE="[${HISTFILE}]" else HISTORY_CUE="" @@ -876,12 +942,14 @@ function selector-printer () { function lsn () { [[ "${LSN_STATE_FILE}" ]] || LSN_STATE_FILE=".lsn-state" - if [[ $1 == "--mem" ]] || [[ "$1" == "-m" ]]; then + if [[ $1 == "--mem" ]] || [[ "$1" == "-m" ]] + then \ls -pa | sort > "${LSN_STATE_FILE}" echo "State updated." >&2 - elif [[ $1 == "+" ]]; then + elif [[ $1 == "+" ]] + then shift @@ -891,7 +959,8 @@ function lsn () { sort ${TMP} | uniq -u > "${LSN_STATE_FILE}" \rm ${TMP} - elif [[ "$1" ]]; then + elif [[ "$1" ]] + then cat >&2 < ...] @@ -908,21 +977,25 @@ Where stored state EOF - if [[ ! "$1" == "-h" ]] && [[ ! "$1" == "--help" ]]; then + if [[ ! "$1" == "-h" ]] && [[ ! "$1" == "--help" ]] + then echo >&2 "Unknown option \`\`$1''." return 1 fi else - if [[ -f "${LSN_STATE_FILE}" ]]; then + if [[ -f "${LSN_STATE_FILE}" ]] + then TMP=$(mktemp /tmp/lsn.XXXXXX) \ls -pa | sort > ${TMP} - if diff > /dev/null ${TMP} "${LSN_STATE_FILE}"; then + 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 + \comm -2 -3 "${LSN_STATE_FILE}" ${TMP} | while read line + do echo "${VT_RED_FG}${VT_BOLD}${line}${VT_RESET} (missing)" done fi @@ -941,7 +1014,8 @@ function prompt_command () { [[ "${CORE_CHECK_PWD}" == ${PWD} ]] || find . -maxdepth 1 -name "core__*" | awk '{print "'${VT_RED_FG}'"$0"'${VT_RESET}'"}' CORE_CHECK_PWD=${PWD} - # if [[ $(umask) != 0022 ]]; then + # if [[ $(umask) != 0022 ]] + # then # echo "Umask changed to $(umask)" # fi # save the history after every command to avoid loosing some when