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." _______________________________________________ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
