diff options
| author | allanjude <allanjude@FreeBSD.org> | 2015-04-15 20:55:43 +0000 |
|---|---|---|
| committer | allanjude <allanjude@FreeBSD.org> | 2015-04-15 20:55:43 +0000 |
| commit | ac2c19f7217d2592521bab48c9b29a676873fae8 (patch) | |
| tree | 75b9d38f3ab3b2fcfb86c6d4178d8ee8fe117604 /usr.sbin/freebsd-update | |
| parent | ad77d0b1c1c3c09a9bf76bebb397102d08ed35c6 (diff) | |
| download | FreeBSD-src-ac2c19f7217d2592521bab48c9b29a676873fae8.zip FreeBSD-src-ac2c19f7217d2592521bab48c9b29a676873fae8.tar.gz | |
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.
Diffstat (limited to 'usr.sbin/freebsd-update')
| -rw-r--r-- | usr.sbin/freebsd-update/freebsd-update.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/usr.sbin/freebsd-update/freebsd-update.sh b/usr.sbin/freebsd-update/freebsd-update.sh index 2434929..fda1d90 100644 --- a/usr.sbin/freebsd-update/freebsd-update.sh +++ b/usr.sbin/freebsd-update/freebsd-update.sh @@ -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." |
