From: Francois Fleuret Date: Tue, 25 Jan 2011 20:50:05 +0000 (+0100) Subject: Added quotes around $1 in many places. X-Git-Url: https://fleuret.org/cgi-bin/gitweb/gitweb.cgi?a=commitdiff_plain;h=bcb2c58dc4ae99501c193c207f9c69c350e66d92;p=scripts.git Added quotes around $1 in many places. --- diff --git a/bashrc b/bashrc index 5c97af0..66dc586 100644 --- a/bashrc +++ b/bashrc @@ -153,8 +153,8 @@ function fn () { # 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 @@ -166,7 +166,7 @@ function cap () { 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} @@ -176,8 +176,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 @@ -207,7 +207,7 @@ function trash () { # alias trash=trash.sh function mmsget () { - mplayer $1 -dumpstream -dumpfile $(basename $1) + mplayer "$1" -dumpstream -dumpfile $(basename "$1") } ###################################################################### @@ -218,7 +218,7 @@ function map () { 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 @@ -250,14 +250,14 @@ function pho () { } # function rotjpeg () { - # if [ $1 == "90" ] || [ $1 == "180" ] || [ $1 == "270" ]; then + # if [ "$1" == "90" ] || [ "$1" == "180" ] || [ "$1" == "270" ]; then # TEMP=$(mktemp /tmp/rotjpeg.XXXXXX) - # echo jpegtran -rotate $1 -copy all $2 > ${TEMP} + # 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." + # echo "Can not rotate with an angle of "$1" degrees." # fi # } @@ -281,18 +281,21 @@ function dt () { ## When invoked without an argument this "ifdown" removes the last ## interface which was ifuped -[[ ${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 [[ ! "$@" ]] && [[ -s ${IFUPRC} ]]; then - # If we have no argument and there is a .ifuprc, use it - ARGS=$(tail -1 ${IFUPRC}) +alias ifup="echo Try netup" +alias ifdown="echo Try netdown" + +function netup () { + if [[ ! "$@" ]] && [[ -s ${NETUP_HISTORY} ]]; then + # 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} >> ${IFUPRC} + echo ${ARGS} > ${NETUP_HISTORY} fi + echo "${VT_GREEN_FG}Running [sudo ifup ${ARGS}]${VT_RESET}" sudo ifup ${ARGS} @@ -307,12 +310,11 @@ function ifup () { 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="$@" @@ -379,17 +381,17 @@ function keep () { function burn () { set -e DEVICE="/dev/cdrw" - if [[ ! $1 ]]; then + if [[ ! "$1" ]]; then echo "burn " >&2 - elif [[ -f $1 ]]; then - if [[ $(file $1 | grep "ISO 9660") ]]; then + 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 + elif [[ -d "$1" ]]; then TMP=$(mktemp /tmp/cdimage.XXXXXX) && \ - genisoimage -input-charset iso8859-1 -r -o ${TMP} $1 && \ + genisoimage -input-charset iso8859-1 -r -o ${TMP} "$1" && \ wodim -eject -v dev=${DEVICE} ${TMP} rm -f ${TMP} else @@ -408,7 +410,7 @@ function dvd () { echo " o Show/hide the timing" echo - if [[ $1 ]]; then + if [[ "$1" ]]; then dvd_device="$1" shift else @@ -417,7 +419,7 @@ function dvd () { title="1" - if [[ $1 ]]; then + if [[ "$1" ]]; then title=$1 shift fi @@ -539,8 +541,8 @@ function mksmall () { 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}" @@ -645,8 +647,8 @@ function git-backup () { 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."