From owner-svn-src-all@FreeBSD.ORG  Wed Apr 15 20:55:44 2015
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 660CEE5D;
 Wed, 15 Apr 2015 20:55:44 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 522EA172;
 Wed, 15 Apr 2015 20:55:44 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t3FKtijg086095;
 Wed, 15 Apr 2015 20:55:44 GMT (envelope-from allanjude@FreeBSD.org)
Received: (from allanjude@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t3FKtiDU086094;
 Wed, 15 Apr 2015 20:55:44 GMT (envelope-from allanjude@FreeBSD.org)
Message-Id: <201504152055.t3FKtiDU086094@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: allanjude set sender to
 allanjude@FreeBSD.org using -f
From: Allan Jude <allanjude@FreeBSD.org>
Date: Wed, 15 Apr 2015 20:55:44 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r281563 - head/usr.sbin/freebsd-update
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 15 Apr 2015 20:55:44 -0000

Author: allanjude (doc committer)
Date: Wed Apr 15 20:55:43 2015
New Revision: 281563
URL: https://svnweb.freebsd.org/changeset/base/281563

Log:
  Fix syntax errors in conditions for new features in freebsd-update
  
  Differential Revision:	https://reviews.freebsd.org/D1550
  Submitted by:	kmoore
  Approved by:	delphij
  Obtained from:	PCBSD
  MFC after:	1 week
  X-MFC-With:	279571
  Sponsored by:	ScaleEngine Inc.

Modified:
  head/usr.sbin/freebsd-update/freebsd-update.sh

Modified: head/usr.sbin/freebsd-update/freebsd-update.sh
==============================================================================
--- head/usr.sbin/freebsd-update/freebsd-update.sh	Wed Apr 15 20:16:31 2015	(r281562)
+++ head/usr.sbin/freebsd-update/freebsd-update.sh	Wed Apr 15 20:55:43 2015	(r281563)
@@ -690,7 +690,7 @@ fetch_check_params () {
 	fi
 
 	# Check that we have updates ready to install
-	if [ -f ${BDHASH}-install/kerneldone && $FORCEFETCH -eq 0 ]; then
+	if [ -f ${BDHASH}-install/kerneldone -a $FORCEFETCH -eq 0 ]; then
 		echo "You have a partially completed upgrade pending"
 		echo "Run '$0 install' first."
 		echo "Run '$0 fetch -F' to proceed anyway."
@@ -3220,7 +3220,7 @@ get_params () {
 # Fetch command.  Make sure that we're being called
 # interactively, then run fetch_check_params and fetch_run
 cmd_fetch () {
-	if [ ! -t 0 && $NOTTYOK -eq 0 ]; then
+	if [ ! -t 0 -a $NOTTYOK -eq 0 ]; then
 		echo -n "`basename $0` fetch should not "
 		echo "be run non-interactively."
 		echo "Run `basename $0` cron instead."