--- cfmaps/cfupdate	2005/12/12 01:38:19	1.17
+++ cfmaps/cfupdate	2007/02/14 02:38:40	1.22
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 # cfupdate - convert a crossfire maps hierarchy to html
-# Copyright (C) 2005      Marc Lehmann <gvpe@schmorp.de>
+# Copyright (C) 2005,2007 Marc Lehmann <cfmaps@schmorp.de>
 #
 # CFUPDATE is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -17,11 +17,11 @@
 # along with gvpe; if not, write to the Free Software
 # Foundation, Inc. 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
-VERSION=1.11
+VERSION=1.112
 
 umask 022
 
-SRC=/root/src/crossfire
+SRC=/root/src/cfmaps
 PATH="$SRC:$PATH"
 BASE="/var/www/cfmaps.schmorp.de"
 export CROSSFIRE_LIBDIR="$BASE"/lib
@@ -30,10 +30,13 @@
 
 cvs -Q -z3 update -AdP | grep -v ^\\?
 
-wget -qm http://www.eracc.com/mlab/mlab-devel.tar.gz
-tar xzpf www.eracc.com/mlab/mlab-devel.tar.gz
-chown -R root.root mlab-devel
-chmod -R u=rwX,go=rX mlab-devel
+#wget -qm --no-check-certificate https://cat2.dynu.ca/cat2/mlab-devel.tar.gz
+#if [ cat2.dynu.ca/cat2/mlab-devel.tar.gz -nt cat2.dynu.ca/cat2/mlab-devel.tar.gz~ ]; then
+#   tar xzpf cat2.dynu.ca/cat2/mlab-devel.tar.gz
+#   chown -R root.root mlab-devel
+#   chmod -R u=rwX,go=rX mlab-devel
+#   ln -f cat2.dynu.ca/cat2/mlab-devel.tar.gz cat2.dynu.ca/cat2/mlab-devel.tar.gz~
+#fi
 
 rm -f .cfmap2html
 
@@ -71,7 +74,7 @@
                     ;;
                   * )
                     if head -5 "$file" | grep -q "^arch map"; then
-                       echo >&7 "<li><a href='$file.xhtml'>$file</a> [map]</li>"
+                       echo >&7 "<li><a href='${file%.map}.xhtml'>${file%.map}</a> [map]</li>"
                        DIR="${dir#/}"
                        echo "$DIR$file" >>$BASE/.cfmap2html
                     else
@@ -103,10 +106,16 @@
 		   <li><a href="/world/world_128_109.xhtml">Wolfsburg</a></li>
 		   <li><a href="/world/world_128_101.xhtml">Azumauindo</a></li>
 		</ul>
-		<p class="footer">created by <a href='http://software.schmorp.de/#crossfire'>cfupdate</a> version $VERSION</p>
+		<p class="footer">created by <a href='http://software.schmorp.de/pkg/cfmaps'>cfupdate</a> version $VERSION</p>
 		EOF
          echo >&7 "</body></html>"
-      } 7>index.xhtml
+      } 7>index.xhtml~
+
+      if [ "$DIR" = "world/" -o "$DIR" = "world-overlay/" ]; then
+         rm index.xhtml~
+      else
+         mv index.xhtml~ index.xhtml
+      fi
       #gzip -7f index.xhtml
    )
 done
@@ -118,7 +127,8 @@
 #rm -f .cfmap2html
 
 cfarch2html
-cfworldmap
+cfworldmap world
+cfworldmap world-overlay
 
 chown -R root.root .
 chmod -R u=rwX,go=rX .