[svnbook commit] r1470 - trunk/src/nb
svnbook-dev at red-bean.com
Sat Jun 18 20:35:04 CDT 2005
Date: Sat Jun 18 20:35:03 2005
New Revision: 1470
Makefile tweaks in the Norwegian section. Add a check for differences
from the English book.
(bookdiff): Add a diff(1) command to check for differences in the
English text between the English and Norwegian files. Before vimdiff
is started, the user has to press Enter.
(sync): Add a missing -n to echo.
--- trunk/src/nb/Makefile (original)
+++ trunk/src/nb/Makefile Sat Jun 18 20:35:03 2005
@@ -63,8 +63,18 @@
cat $(BDTMP)/eng/$$_ptd | bin/clean_files -e >>$(BDTMP)/eng.txt; \
cat book/$$_ptd | bin/clean_files -e >>$(BDTMP)/norw.txt; \
- vimdiff $(BDTMP)/norw.txt $(BDTMP)/eng.txt
+ @echo Checking files against the English version. If everything is fine,
+ @echo you should see only one line of output between the ===== lines.
+ @echo =====
+ @diff -du $(BDTMP)/eng.txt $(BDTMP)/norw.txt | grep ^-
+ @echo =====
@echo The temporary files are still in $(BDTMP)/ for you to play with.
+ @echo -n Press Enter to launch vimdiff or CTRL-C to exit...
+ vimdiff $(BDTMP)/norw.txt $(BDTMP)/eng.txt
@@ -72,7 +82,7 @@
@echo ======= START svn status =======
@svn status -q
@echo ======== END svn status ========
- @echo If there are no local changes, press ENTER...
+ @echo -n If there are no local changes, press Enter...
@if [ "$(HEAD)" = "" ]; then \
svnversion . | tr -d M >HEADREV; \
More information about the svnbook-dev