[Pkg-haskell-commits] darcs: haskell-hoogle: Merge the two find invocations

[Joachim Breitner]

Tue Sep 18 09:17:31 UTC 2012  Joachim Breitner <mail at joachim-breitner.de>
  * Merge the two find invocations
  Ignore-this: e1b26547775ef36e850f677a5b41efc0

    M ./files_hoogle/update-hoogle -6 +2

Tue Sep 18 09:17:31 UTC 2012  Joachim Breitner <mail at joachim-breitner.de>
  * Merge the two find invocations
  Ignore-this: e1b26547775ef36e850f677a5b41efc0
diff -rN -u old-haskell-hoogle//files_hoogle/update-hoogle new-haskell-hoogle//files_hoogle/update-hoogle
--- old-haskell-hoogle//files_hoogle/update-hoogle	2012-09-18 09:21:30.106324850 +0000
+++ new-haskell-hoogle//files_hoogle/update-hoogle	2012-09-18 09:21:30.114323795 +0000
@@ -15,12 +15,8 @@
 # new database
 $HOOGLE data keyword
 
-echo "Collect txt files on ghc-doc"
-find /usr/share/doc/ghc-doc/html/libraries/ -name "*.txt*" | \
-  haddock-collect $URLPREFIX $DATABASE_DIR/
-
-echo "Collect txt files on libghc-*-doc"
-find /usr/share/doc/ -wholename "/usr/share/doc/libghc-*-doc/html/*.txt" | \
+echo "Collect txt files from ghc-doc and libghc-*-doc"
+find /usr/share/doc -wholename "/usr/share/doc/ghc-doc/html/libraries/*/*.txt*" -or -wholename "/usr/share/doc/libghc-*-doc/html/*.txt" | \
   haddock-collect $URLPREFIX $DATABASE_DIR/
 
 # convert