===================================================================
RCS file: /cvs/openbsd/update_openbsd/update_openbsd,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- openbsd/update_openbsd/update_openbsd	2008/08/12 23:07:05	1.2
+++ openbsd/update_openbsd/update_openbsd	2008/08/12 23:42:09	1.3
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $RedRiver: update_openbsd,v 1.1 2008/08/12 18:45:47 andrew Exp $
+# $RedRiver: update_openbsd,v 1.2 2008/08/12 22:07:05 andrew Exp $
 
 SYSMERGE=/usr/sbin/sysmerge
 MIRROR=ftp://ftp.openbsd.org/pub/OpenBSD
@@ -27,19 +27,19 @@
 
     echo base
     echo etc
-    for d in misc man comp game xbase xetc xfont xserv xshare; do
-        eval e=\$$d
-        c=`ls ${e} 2> /dev/null | wc -l`
-        #echo $c $d $e
-        if [ ${c} -ne 0 ]; then
-            echo $d
+    for _d in misc man comp game xbase xetc xfont xserv xshare; do
+        eval _e=\$${_d}
+        _c=`ls $_e 2> /dev/null | wc -l`
+        #echo $_c $_d $_e
+        if [ $_c -ne 0 ]; then
+            echo $_d
         fi
     done
 }
 
 set_version() {
     CUR_VER=`uname -r`
-    NEW_VER=`dc -e "${CUR_VER} 0.1 + p"`
+    NEW_VER=`dc -e "$CUR_VER 0.1 + p"`
 
     if [ -d $NEW_VER ]; then
         DIR=$NEW_VER
@@ -52,7 +52,7 @@
 
     if [ X"" != X"$FORCE_DIR" ]; then
         if [ -d $FORCE_DIR ]; then
-            DIR=${FORCE_DIR}
+            DIR=$FORCE_DIR
 
             _cv=`echo $CUR_VER | sed -e 's/\.//'`
             if [ -e $DIR/base${_cv}.tgz ]; then
@@ -64,8 +64,8 @@
     if [ X"" == X"$DIR" ]; then
         FTP=${MIRROR}/${NEW_VER}/`machine`
 
-        #echo "ls\nquit\n" | ftp ${MIRROR} | grep "${NEW_VER}"
-        ${FTP_CMD} ${FTP}/MD5 > /dev/null
+        #echo "ls\nquit\n" | ftp $MIRROR | grep "$NEW_VER"
+        $FTP_CMD ${FTP}/MD5 > /dev/null
 
         if [ -e MD5 ]; then
             rm -f MD5
@@ -82,8 +82,8 @@
         FTP=${MIRROR}/${DIR}/`machine`
     fi
 
-    if [ X"" != X"${RELEASEDIR}" ]; then
-        DIR=${RELEASEDIR}
+    if [ X"" != X"$RELEASEDIR" ]; then
+        DIR=$RELEASEDIR
     fi
 
     if [ -d $DIR ]; then
@@ -105,23 +105,23 @@
     fi
 
     mkdir -p $RELEASEDIR
-    cd ${RELEASEDIR}
+    cd $RELEASEDIR
     RELEASEDIR=`pwd`
 
     for _b in /bsd* bsd bsd.mp bsd.rd; do
         if [ -e /${_b} -a ! -e ./${_b} ]; then
-            echo ${FTP_CMD} ${FTP}/${_b}
-            ${FTP_CMD} ${FTP}/${_b}
+            echo $FTP_CMD ${FTP}/${_b}
+            $FTP_CMD ${FTP}/${_b}
         fi
     done
 
     for _s in `installed_sets`; do
-        echo ${FTP_CMD} ${FTP}/${_s}${_v}.tgz
-        ${FTP_CMD} ${FTP}/${_s}${_v}.tgz
+        echo $FTP_CMD ${FTP}/${_s}${_v}.tgz
+        $FTP_CMD ${FTP}/${_s}${_v}.tgz
     done
 
-    echo ${FTP_CMD} ${FTP}/MD5
-    ${FTP_CMD} ${FTP}/MD5
+    echo $FTP_CMD ${FTP}/MD5
+    $FTP_CMD ${FTP}/MD5
     ls bsd* *.tgz > index 
     grep -f index MD5 | md5 -c
 
@@ -132,7 +132,7 @@
 }
 
 install_kernel() {
-    if [ X"${USER}" != X"root" -a X"${SUDO}" == X"" ]; then
+    if [ X"$USER" != X"root" -a X"$SUDO" == X"" ]; then
         echo ${0##*/} must be run as root or SUDO must be set! >&2
         exit 1
     fi
@@ -162,32 +162,32 @@
 
     if [ -e base${_v}.tgz ]; then
         echo Extracting new firmware from base${_v}.tgz
-        ${SUDO} tar -C ${DESTDIR} -xzphf base${_v}.tgz "*etc/firmware/*"
+        $SUDO tar -C $DESTDIR -xzphf base${_v}.tgz "*etc/firmware/*"
     fi
 
-    ${SUDO} rm -f /obsd
-    ${SUDO} ln /bsd /obsd
+    $SUDO rm -f /obsd
+    $SUDO ln /bsd /obsd
     if [ $? -ne 0 ]; then
         echo "Error copying old kernel!"
         exit 1
     fi
 
-    for b in bsd*; do
-        ${SUDO} rm -f /nbsd
+    for _b in bsd*; do
+        $SUDO rm -f /nbsd
 
-        if [ X"$b" == X"bsd" ]; then
+        if [ X"$_b" == X"bsd" ]; then
             echo Copying bsd to /bsd.sp
-            ${SUDO} cp bsd /nbsd && ${SUDO} mv /nbsd /bsd.sp
+            $SUDO cp bsd /nbsd && $SUDO mv /nbsd /bsd.sp
             if [ $? -ne 0 ]; then
                 echo "ERROR: Couldn't copy new SP kernel!" >&2
                 exit 1
             fi
         else
-            if [ -e /${b} ]; then
-                echo Copying ${b} to /
-                ${SUDO} cp ${b} /nbsd && ${SUDO} mv /nbsd /${b}
+            if [ -e /$_b ]; then
+                echo Copying $_b to /
+                $SUDO cp ${_b} /nbsd && $SUDO mv /nbsd /${_b}
                 if [ $? -ne 0 ]; then
-                    echo "ERROR: Couldn't copy new ${b} kernel!" >&2
+                    echo "ERROR: Couldn't copy new $_b kernel!" >&2
                     exit 1
                 fi
             fi
@@ -197,10 +197,10 @@
     if [ ! -h /bsd ]; then
         if [ -e /bsd.mp ]; then
             echo linking /bsd.mp to /bsd
-            ${SUDO} ln -sf /bsd.mp /bsd
+            $SUDO ln -sf /bsd.mp /bsd
         else
             echo linking /bsd.sp to /bsd
-            ${SUDO} ln -sf /bsd.sp /bsd
+            $SUDO ln -sf /bsd.sp /bsd
         fi
         if [ $? -ne 0 ]; then
             echo "ERROR: Couldn't symlink new kernel!" >&2
@@ -210,7 +210,7 @@
 }
 
 install_sets() {
-    if [ X"${USER}" != X"root" -a X"${SUDO}" == X"" ]; then
+    if [ X"$USER" != X"root" -a X"$SUDO" == X"" ]; then
         echo ${0##*/} must be run as root or SUDO must be set! >&2
         exit 1
     fi
@@ -223,18 +223,18 @@
     fi
 
     for _f in *${_v}.tgz; do
-        _path=${DESTDIR}
-        if [ X"etc${_v}.tgz"  == X"${_f}" \
-            -o X"xetc${_v}.tgz" == X"${_f}" ]; then
-            if [ X"" != X"${SYSMERGE}" ]; then
+        _path=$DESTDIR
+        if [ X"etc${_v}.tgz"  == X"$_f" \
+            -o X"xetc${_v}.tgz" == X"$_f" ]; then
+            if [ X"" != X"$SYSMERGE" ]; then
                 continue
             fi
             _path=/var/tmp/temproot
         fi
 
-        echo Extracting ${_f} to $_path
-        ${SUDO} mkdir -p $_path
-        ${SUDO} tar -C $_path -xzphf ${RELEASEDIR}/${_f}
+        echo Extracting $_f to $_path
+        $SUDO mkdir -p $_path
+        $SUDO tar -C $_path -xzphf ${RELEASEDIR}/${_f}
         if [ $? -ne 0 ]; then
             echo "Error extracting ${_f}!" >&2
             exit 1
@@ -245,12 +245,12 @@
 }
 
 update_etc() {
-    if [ X"" == X"${SYSMERGE}" ]; then
+    if [ X"" == X"$SYSMERGE" ]; then
         if [ -e /var/tmp/temproot ]; then
             MERGEMASTER=`which mergemaster`
 
             if [ $? != 0 ]; then
-                ${SUDO} pkg_add -i mergemaster
+                $SUDO pkg_add -i mergemaster
                 MERGEMASTER=`which mergemaster`
                 if [ $? != 0 ]; then
                     echo ERROR: mergemaster not installed! >&2
@@ -259,7 +259,7 @@
             fi
 
             echo '### RUNNING MERGEMASTER ###'
-            ${SUDO} ${MERGEMASTER} -irv
+            $SUDO $MERGEMASTER -irv
         else 
             echo "ERROR: no source for etc!" >&2
             exit 1
@@ -274,26 +274,27 @@
 
         _cv=`echo $CUR_VER | sed -e 's/\.//'`
         if [ -e etc${_cv}.tgz ]; then
-            _args="${_args} -s etc${_cv}.tgz"
+            _args="$_args -s etc${_cv}.tgz"
         fi
         if [ -e xetc${_cv}.tgz ]; then
-            _args="${_args} -x xetc${_cv}.tgz"
+            _args="$_args -x xetc${_cv}.tgz"
         fi
         if [ X"" == X"$_args" ]; then 
             echo ERROR: No upgrade sets found! >&2
         else
             echo '### RUNNING SYSMERGE ###'
             _args="-a $_args"
-            ${SUDO} ${SYSMERGE} $_args
+            $SUDO $SYSMERGE $_args
         fi
     fi
 }
 
-
 PKG_PATH=${PKG_PATH:=/usr/ports/packages/`machine`/all/:${MIRROR}/`uname -r`/packages/`machine`/}
 
-if [ ! -e ${SYSMERGE} ]; then
-    SYSMERGE=
+if [ X"" != X"$SYSMERGE" ]; then
+    if [ ! -e $SYSMERGE ]; then
+        SYSMERGE=
+    fi
 fi
 
 set_version