Now check the offensive fortunes as well.

Fix some long lines in them.

diff --git a/fortune-mod/datfiles/Makefile b/fortune-mod/datfiles/Makefile
index 9011410e69cd2a3dafdee8ca7b0c7ba186bfd13a..71ba4a0f5f18bfdae5d71b2d670403cec6e6e635 100644 (file)
--- a/fortune-mod/datfiles/Makefile
+++ b/fortune-mod/datfiles/Makefile
@@ -13,7 +13,9 @@ STRFILE=../util/strfile
 
 all: cookies o-cookies w-cookies
 
-check:
+check: local-check o-check
+
+local-check:
        for i in $(COOKIES) ; \
                do \
                        if ! sh $(TOP)/tests/scripts/check-fortune-file.sh "$$i" ; then \
@@ -21,6 +23,9 @@ check:
                        fi ; \
                done;
 
+o-check:
+       cd off && $(MAKE) OCOOKIEDIR=$(OCOOKIEDIR) check
+
 cookies: cookies-stamp
 
 o-cookies:

diff --git a/fortune-mod/datfiles/off/Makefile b/fortune-mod/datfiles/off/Makefile
index 53fe418e2ac6d4644f797e096dc5192111452abb..3d5ecb5fa3893b5623782444ed972245d4f2ac2f 100644 (file)
--- a/fortune-mod/datfiles/off/Makefile
+++ b/fortune-mod/datfiles/off/Makefile
@@ -1,3 +1,4 @@
+TOP = ../..
 
 OCOOKIES_UNROTATED=drugs misandry privates sex astrology ethnic \
        miscellaneous racism songs-poems black-humor hphobia misogyny \
@@ -8,8 +9,8 @@ OCOOKIES_ROTATED=
 
 OCOOKIES=$(OCOOKIES_UNROTATED) $(OCOOKIES_ROTATED)
 
-STRFILE=../../util/strfile
-ROT=../../util/rot
+STRFILE=$(TOP)/util/strfile
+ROT=$(TOP)/util/rot
 
 
 all:   ocookies-stamp
@@ -24,6 +25,13 @@ rotated-stamp:
            do $(ROT) < unrotated/$$i > rotated/$$i || exit $$? ; (cd rotated && ln -s $$i $$i.u8) ; done
        touch rotated-stamp
 
+check: all
+       for i in $(OCOOKIES) ; \
+               do \
+                       if ! sh $(TOP)/tests/scripts/check-fortune-file.sh "unrotated/$$i" ; then \
+                               exit 1; \
+                       fi ; \
+               done;
 install:
        install -m 0755 -d $(OCOOKIEDIR)
        for i in $(OCOOKIES) ; \

diff --git a/fortune-mod/datfiles/off/unrotated/black-humor b/fortune-mod/datfiles/off/unrotated/black-humor
index 707dba72d518b4a6c4c73fb87c6644641535b365..014b74f5a19ce36a6c6d89bdcf7b44ebd146225e 100644 (file)
--- a/fortune-mod/datfiles/off/unrotated/black-humor
+++ b/fortune-mod/datfiles/off/unrotated/black-humor
@@ -254,7 +254,8 @@ Dad always thought laughter was the best medicine, which I guess is why
 several of us died of tuberculosis.
                -- Jack Handley
 %
-Dammit, how many times do I have to tell you?  _____\b\b\b\b\bFIRST you rape, ____\b\b\b\bTHEN you pillage!!
+Dammit, how many times do I have to tell you?
+_____\b\b\b\b\bFIRST you rape, ____\b\b\b\bTHEN you pillage!!
 %
 Damned if I know.  And you can be fuckin' sure I'll never rent no car
 from Avis again.

diff --git a/fortune-mod/datfiles/off/unrotated/linux b/fortune-mod/datfiles/off/unrotated/linux
index 3b39c4d85085a77bd5b6515ba7b6905c0cfe34c4..aa7971d6691b31e94d0b05ad1d843537ba880976 100644 (file)
--- a/fortune-mod/datfiles/off/unrotated/linux
+++ b/fortune-mod/datfiles/off/unrotated/linux
@@ -20,9 +20,11 @@ You can fuck that up to your heart's delight by fiddling with the
                 printk("ufs_read_super: fucking Sun blows me\n");
        -- /usr/src/linux/fs/ufs/ufs_super.c
 %
-KDE == (see GayDE) Kool Desktop Environment - Make X Window look like winbloze...
-What a fucking great idea!  The developers of this have a mental sickness, please
-avoid this product -> see GNOME.
+KDE == (see GayDE) Kool Desktop Environment - Make X Window look like
+winbloze...
+
+What a fucking great idea!  The developers of this have a mental sickness,
+please avoid this product -> see GNOME.
        -- Jakes on #Debian
 %
 <Overfiend> "Oxford University has joined with IBM and the UK