[PC-BSD Commits] r15820 - pcbsd/current/src-sh/pc-netupdate

[svn at pcbsd.org]

Author: kris
Date: 2012-03-15 17:03:24 +0000 (Thu, 15 Mar 2012)
New Revision: 15820

Modified:
   pcbsd/current/src-sh/pc-netupdate/pc-netupdate
Log:

When we target a network update to run, return proper exit status, and 
also skip the time check



Modified: pcbsd/current/src-sh/pc-netupdate/pc-netupdate
===================================================================
--- pcbsd/current/src-sh/pc-netupdate/pc-netupdate	2012-03-15 10:34:35 UTC (rev 15819)
+++ pcbsd/current/src-sh/pc-netupdate/pc-netupdate	2012-03-15 17:03:24 UTC (rev 15820)
@@ -63,8 +63,8 @@
 		expr $_curTime - $_oTime >/dev/null 2>/dev/null
 		if [ "$?" = "0" ] ; then
 			_passed=`expr $_curTime - $_oTime`
-			if [ "$_passed" -lt "$_trigTime" ] ; then
-				return;
+			if [ "$_passed" -lt "$_trigTime" -a "$2" != "force" ] ; then
+				return 1;
 			fi
 		fi
 		
@@ -109,6 +109,7 @@
 	date +%s > ${_upDir}/.time
 
 	echo "Updated $RURL successfully!"
+        return 0
 
 }
 
@@ -133,6 +134,6 @@
       echo "No such file update module: ${1}"
       exit 1
    fi
-   check_updates "${FILEDBDIR}/${1}"
-   exit 0
+   check_updates "${FILEDBDIR}/${1}" "force"
+   exit $?
 fi