зеркало из https://github.com/mozilla/pjs.git
Moving egrep -q to redirect to /dev/null to get around egrep portability problem. Thanks to ramiro for this fix.
This commit is contained in:
Родитель
f5df236f59
Коммит
7212a7d80d
|
@ -204,10 +204,10 @@ checkout:
|
|||
@date > $(CVSCO_LOGFILE)
|
||||
cd $(ROOTDIR) && \
|
||||
$(CVSCO) SeaMonkeyEditor | tee -a $(CVSCO_LOGFILE)
|
||||
# @if egrep -q "^C " $(CVSCO_LOGFILE) ; then \
|
||||
# echo "$(MAKE): *** Conflicts during checkout. \
|
||||
# Refer to $(CVSCO_LOGFILE)."; \
|
||||
# exit 1; \
|
||||
@if egrep "^C " $(CVSCO_LOGFILE) > /dev/null 2>&1 ; then \
|
||||
echo "$(MAKE): *** Conflicts during checkout. \
|
||||
Refer to $(CVSCO_LOGFILE)."; \
|
||||
exit 1; \
|
||||
fi
|
||||
|
||||
|
||||
|
|
Загрузка…
Ссылка в новой задаче