diff options
author | jpaetzel <jpaetzel@FreeBSD.org> | 2011-03-27 16:57:54 +0000 |
---|---|---|
committer | jpaetzel <jpaetzel@FreeBSD.org> | 2011-03-27 16:57:54 +0000 |
commit | c0b9051b174edd52b1c981a25a28d77d5133a049 (patch) | |
tree | 7685cacc260db6392774e2cc0fe2507f4afd24ba /usr.sbin/pc-sysinstall/backend/functions-extractimage.sh | |
parent | 79f5bd9d163ed51b54be37305ac97c975667db20 (diff) | |
download | FreeBSD-src-c0b9051b174edd52b1c981a25a28d77d5133a049.zip FreeBSD-src-c0b9051b174edd52b1c981a25a28d77d5133a049.tar.gz |
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)
Diffstat (limited to 'usr.sbin/pc-sysinstall/backend/functions-extractimage.sh')
-rwxr-xr-x | usr.sbin/pc-sysinstall/backend/functions-extractimage.sh | 52 |
1 files changed, 26 insertions, 26 deletions
diff --git a/usr.sbin/pc-sysinstall/backend/functions-extractimage.sh b/usr.sbin/pc-sysinstall/backend/functions-extractimage.sh index f9be5ea..75b5a41 100755 --- a/usr.sbin/pc-sysinstall/backend/functions-extractimage.sh +++ b/usr.sbin/pc-sysinstall/backend/functions-extractimage.sh @@ -59,7 +59,7 @@ start_extract_uzip_tar() MDDEVICE=`mdconfig -a -t vnode -o readonly -f ${INSFILE}` mkdir -p ${FSMNT}.uzip mount -r /dev/${MDDEVICE}.uzip ${FSMNT}.uzip - if [ "$?" != "0" ] + if [ $? -ne 0 ] then exit_err "ERROR: Failed mounting the ${INSFILE}" fi @@ -67,7 +67,7 @@ start_extract_uzip_tar() # Copy over all the files now! tar cvf - . 2>/dev/null | tar -xpv -C ${FSMNT} ${TAROPTS} -f - 2>&1 | tee -a ${FSMNT}/.tar-extract.log - if [ "$?" != "0" ] + if [ $? -ne 0 ] then cd / echo "TAR failure occurred:" >>${LOGOUT} @@ -84,7 +84,7 @@ start_extract_uzip_tar() ;; tar) tar -xpv -C ${FSMNT} -f ${INSFILE} ${TAROPTS} >&1 2>&1 - if [ "$?" != "0" ] + if [ $? -ne 0 ] then exit_err "ERROR: Failed extracting the tar image" fi @@ -127,7 +127,7 @@ start_extract_split() then echo_log "Extracting" `basename ${dir}` echo "y" | sh install.sh >/dev/null - if [ "$?" != "0" ] + if [ $? -ne 0 ] then exit_err "ERROR: Failed extracting ${dir}" fi @@ -143,7 +143,7 @@ start_extract_split() then echo_log "Extracting" `basename ${KERNELS}` echo "y" | sh install.sh generic >/dev/null - if [ "$?" != "0" ] + if [ $? -ne 0 ] then exit_err "ERROR: Failed extracting ${KERNELS}" fi @@ -160,7 +160,7 @@ start_extract_split() then echo_log "Extracting" `basename ${SOURCE}` echo "y" | sh install.sh all >/dev/null - if [ "$?" != "0" ] + if [ $? -ne 0 ] then exit_err "ERROR: Failed extracting ${SOURCE}" fi @@ -202,7 +202,7 @@ fetch_install_file() fetch_file "${FTPPATH}/${INSFILE}.md5" "${OUTFILE}.md5" "0" # Done fetching, now reset the INSFILE to our downloaded archived - INSFILE="${OUTFILE}" ; export INSFILE + export INSFILE="${OUTFILE}" }; @@ -244,7 +244,7 @@ fetch_split_files() NETRC="${OUTFILE}/.netrc" - cat<<EOF>"${NETRC}" + cat <<EOF >"${NETRC}" machine ${FTPHOST} login anonymous password anonymous @@ -255,14 +255,14 @@ EOF for d in ${DIRS} do - cat<<EOF>>"${NETRC}" + cat <<EOF >>"${NETRC}" cd ${FTPDIR}/${d} lcd ${OUTFILE}/${d} mreget * EOF done - cat<<EOF>>"${NETRC}" + cat <<EOF >>"${NETRC}" bye @@ -272,7 +272,7 @@ EOF echo "$ INSTALL" | ftp -N "${NETRC}" "${FTPHOST}" # Done fetching, now reset the INSFILE to our downloaded archived - INSFILE="${OUTFILE}" ; export INSFILE + export INSFILE="${OUTFILE}" } # Function which does the rsync download from the server specified in cfg @@ -283,27 +283,27 @@ start_rsync_copy() if [ -z "${VAL}" ]; then exit_err "ERROR: rsyncPath is unset! Please check your config and try again." fi - RSYNCPATH="${VAL}" ; export RSYNCPATH + export RSYNCPATH="${VAL}" get_value_from_cfg rsyncHost if [ -z "${VAL}" ]; then exit_err "ERROR: rsyncHost is unset! Please check your config and try again." fi - RSYNCHOST="${VAL}" ; export RSYNCHOST + export RSYNCHOST="${VAL}" get_value_from_cfg rsyncUser if [ -z "${VAL}" ]; then exit_err "ERROR: rsyncUser is unset! Please check your config and try again." fi - RSYNCUSER="${VAL}" ; export RSYNCUSER + export RSYNCUSER="${VAL}" get_value_from_cfg rsyncPort if [ -z "${VAL}" ]; then exit_err "ERROR: rsyncPort is unset! Please check your config and try again." fi - RSYNCPORT="${VAL}" ; export RSYNCPORT + export RSYNCPORT="${VAL}" - COUNT="1" + COUNT=1 while z=1 do @@ -317,14 +317,14 @@ start_rsync_copy() --rsync-path="rsync --fake-super" \ -e "ssh -p ${RSYNCPORT}" \ ${RSYNCUSER}@${RSYNCHOST}:${RSYNCPATH}/./ ${FSMNT} - if [ "$?" != "0" ] + if [ $? -ne 0 ] then echo "Rsync failed! Tries: ${COUNT}" else break fi - COUNT="`expr ${COUNT} + 1`" + COUNT=$((COUNT+1)) done }; @@ -339,8 +339,8 @@ start_image_install() # We are ready to start mounting, lets read the config and do it while read line do - echo $line | grep "^disk0=" >/dev/null 2>/dev/null - if [ "$?" = "0" ] + echo $line | grep -q "^disk0=" 2>/dev/null + if [ $? -eq 0 ] then # Found a disk= entry, lets get the disk we are working on get_value_from_string "${line}" @@ -348,11 +348,11 @@ start_image_install() DISK="$VAL" fi - echo $line | grep "^commitDiskPart" >/dev/null 2>/dev/null - if [ "$?" = "0" ] + echo $line | grep -q "^commitDiskPart" 2>/dev/null + if [ $? -eq 0 ] then # Found our flag to commit this disk setup / lets do sanity check and do it - if [ ! -z "${DISK}" ] + if [ -n "${DISK}" ] then # Write the image @@ -376,9 +376,9 @@ init_extraction() # Figure out what file we are using to install from via the config get_value_from_cfg installFile - if [ ! -z "${VAL}" ] + if [ -n "${VAL}" ] then - INSFILE="${VAL}" ; export INSFILE + export INSFILE="${VAL}" else # If no installFile specified, try our defaults if [ "$INSTALLTYPE" = "FreeBSD" ] @@ -407,7 +407,7 @@ init_extraction() dvd|usb) # Lets start by mounting the disk opt_mount - if [ ! -z "${INSDIR}" ] + if [ -n "${INSDIR}" ] then INSDIR="${CDMNT}/${INSDIR}" ; export INSDIR start_extract_split |