diff options
| author | Sheldon Hearn <sheldonh@FreeBSD.org> | 1999-09-13 15:44:20 +0000 |
|---|---|---|
| committer | Sheldon Hearn <sheldonh@FreeBSD.org> | 1999-09-13 15:44:20 +0000 |
| commit | 321704296f6ba1a5885ff7064b14fbeecf20c340 (patch) | |
| tree | 920fd19901d5e07524b525646b51b9635f1686a7 /etc/isdn/answer | |
| parent | 4a086b52ca9b3fe330755fcf9e1c7a9c657927ee (diff) | |
| download | src-321704296f6ba1a5885ff7064b14fbeecf20c340.tar.gz src-321704296f6ba1a5885ff7064b14fbeecf20c340.zip | |
Apply a consistent style to most of the etc scripts. Particularly, use
case instead of test where appropriate, since case allows case is a sh
builtin and (as a side-effect) allows case-insensitivity.
Changes discussed on freebsd-hackers.
Submitted by: Doug Barton <Doug@gorean.org>
Notes
Notes:
svn path=/head/; revision=51231
Diffstat (limited to 'etc/isdn/answer')
| -rwxr-xr-x | etc/isdn/answer | 103 |
1 files changed, 46 insertions, 57 deletions
diff --git a/etc/isdn/answer b/etc/isdn/answer index df9e8041de70..d39a98331206 100755 --- a/etc/isdn/answer +++ b/etc/isdn/answer @@ -17,92 +17,81 @@ VARDIR=/var/isdn LIBDIR=/usr/share/isdn LOGFILE=/tmp/answer.log -NCALLFILE=$VARDIR/ncall +NCALLFILE=${VARDIR}/ncall DATE=`date +%d%H` DF=0 dF=0 sF=0 -set -- `getopt D:d:s: $*` - -if test $? != 0 -then +if ! set -- `getopt D:d:s: $*`; then echo 'Usage: answer -D device -d destination -s source' exit 1 fi -for i -do - case "$i" - in - -D) - DEVICE=$2 - DF=1 - shift - shift - ;; - -d) - DEST=$2 - dF=1 - shift - shift - ;; - -s) - SRC=$2 - sF=1 - shift - shift - ;; - --) - shift - break - ;; +for i ; do + case ${i} in + -D) + DEVICE=$2 + DF=1 + shift + shift + ;; + -d) + DEST=$2 + dF=1 + shift + shift + ;; + -s) + SRC=$2 + sF=1 + shift + shift + ;; + --) + shift + break + ;; esac done -echo "" >>$LOGFILE +echo "" >>${LOGFILE} -if [ $DF -eq 0 -o $dF -eq 0 -o $sF -eq 0 ] -then +if [ "${DF}" -eq 0 -o "${dF}" -eq 0 -o "${sF}" -eq 0 ]; then echo 'Usage: answer -D device -d destination -s source' exit 1 -fi +fi -echo "answer: device $DEVICE destination $DEST source $SRC " >>$LOGFILE +echo "answer: device ${DEVICE} destination ${DEST} source ${SRC} " >>${LOGFILE} -if [ -f $NCALLFILE ] -then - NCALL=`cat $NCALLFILE` -else +if [ -r "${NCALLFILE}" ]; then + NCALL=`cat ${NCALLFILE}` +else NCALL=0 fi -NCALL=`printf "%.4d" $NCALL` +NCALL=`printf "%.4d" ${NCALL}` -echo Date: `date` >> $VARDIR/I.$NCALL.$DATE +echo Date: `date` >> ${VARDIR}/I.${NCALL}.${DATE} -if [ "$SRC" != "" ] -then - echo "From: $SRC" >> $VARDIR/I.$NCALL.$DATE +if [ -n "${SRC}" ]; then + echo "From: ${SRC}" >> ${VARDIR}/I.${NCALL}.${DATE} fi -if [ "$DEST" != "" ] -then - echo "To: $DEST" >> $VARDIR/I.$NCALL.$DATE +if [ -n "${DEST}" ]; then + echo "To: ${DEST}" >> ${VARDIR}/I.${NCALL}.${DATE} fi -if [ -f $LIBDIR/beep.al ] -then - dd of=$DEVICE if=$LIBDIR/beep.al bs=2k # >/dev/null 2>&1 +if [ -r "${LIBDIR}/beep.al" ]; then + dd of=${DEVICE} if=${LIBDIR}/beep.al bs=2k # >/dev/null 2>&1 fi -if [ -f $LIBDIR/msg.al ] -then - dd of=$DEVICE if=$LIBDIR/msg.al bs=2k # >/dev/null 2>&1 - if [ -f $LIBDIR/beep.al ] +if [ -r "${LIBDIR}/msg.al" ]; then + dd of=${DEVICE} if=${LIBDIR}/msg.al bs=2k # >/dev/null 2>&1 + if [ -r "${LIBDIR}/beep.al" ] then - dd of=$DEVICE if=$LIBDIR/beep.al bs=2k # >/dev/null 2>&1 + dd of=${DEVICE} if=${LIBDIR}/beep.al bs=2k # >/dev/null 2>&1 fi fi -echo `expr $NCALL + 1` >$NCALLFILE +echo `expr ${NCALL} + 1` >${NCALLFILE} |