Fix a syntax error in a little-used function.

Replace expr with $(())
Replace grep > /dev/null with grep -q
Replace "$?" = "0" with $? -eq 0 in tests
Consolidate export statements with variable assignment
Replace tests for ! -z with -n

Approved by:	kib (mentor)

1 files changed, 3 insertions, 3 deletions

diff --git a/usr.sbin/pc-sysinstall/backend/functions-installpackages.sh b/usr.sbin/pc-sysinstall/backend/functions-installpackages.sh
index 3e0a4ba..7572efb 100755
--- a/usr.sbin/pc-sysinstall/backend/functions-installpackages.sh
+++ b/usr.sbin/pc-sysinstall/backend/functions-installpackages.sh
@@ -36,8 +36,8 @@ determine_package_dependencies()
   local PKGNAME="${1}"
   local DEPFILE="${2}"
 
-  grep "${PKGNAME}" "${DEPFILE}" >/dev/null
-  if [ "$?" -ne "0" ]
+  grep -q "${PKGNAME}" "${DEPFILE}"
+  if [ $? -ne 0 ]
   then
     echo "${PKGNAME}" >> "${DEPFILE}"
     get_package_dependencies "${PKGNAME}" "1"
@@ -78,7 +78,7 @@ install_packages()
 {
   # First, lets check and see if we even have any packages to install
   get_value_from_cfg installPackages
-  if [ ! -z "${VAL}" ]
+  if [ -n "${VAL}" ]
   then
     HERE=`pwd`
     rc_nohalt "mkdir -p ${FSMNT}/${PKGTMPDIR}"