d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix syntax errors in conditions for new features in freebsd-update

Browse Source 
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.
This commit is contained in:
Allan Jude 2015-04-15 20:55:43 +00:00
parent dda11d4ab9
commit 8bf2dccec4
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=281563
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
usr.sbin/freebsd-update/freebsd-update.sh
View File

@ -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."