X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;ds=sidebyside;f=dotfiles2html%2Fdotfiles2html.py;h=a00918b71cf41605823d237ee50e75f4bdfc30a0;hb=6169f6bcf24d833bd561a17494d77c30b3c58739;hp=f13e4dcaa95ed9c8262ebdaa99d78cf0d27203c0;hpb=6aa7ab00b5dc30b6221d0d55fecc1b0b957cdd79;p=phdru.name%2Fphdru.name.git

diff --git a/dotfiles2html/dotfiles2html.py b/dotfiles2html/dotfiles2html.py
index f13e4dc..a00918b 100755
--- a/dotfiles2html/dotfiles2html.py
+++ b/dotfiles2html/dotfiles2html.py
@@ -1,6 +1,13 @@
-#! /usr/local/bin/python -O
+#! /usr/bin/env python
 
-import os, shutil
+__version__ = "$Revision$"[11:-2]
+__revision__ = "$Id$"[5:-2]
+__date__ = "$Date$"[7:-2]
+__author__ = "Oleg Broytman <phd@phd.pp.ru>"
+__copyright__ = "Copyright (C) 2004-2009 PhiloSoft Design"
+
+
+import os, shutil, filecmp
 os.umask(0022) # octal; -rw-r--r--
 
 from m_lib.m_path import get_homedir
@@ -27,6 +34,7 @@ def add_headers(fname, prev, next):
       html_file.write("#attr $Prev = \"%s.html\"\n" % prev)
    if next:
       html_file.write("#attr $Next = \"%s.html\"\n" % next)
+   html_file.write('#attr $alternates = (("text/plain", "Plain text version", "%s"),)' % fname)
    html_file.write("\n")
    html_file.write("#def body_html\n")
    html_file.write("#raw\n")
@@ -39,18 +47,25 @@ def add_headers(fname, prev, next):
    html_file.close()
 
 
-file_types = (("fvwm2rc", "fvwm"),
+file_types = (("fvwm2rc", "fvwm2m4"),
       ("mailcap", "conf"), ("mime.types", "conf"),
       ("muttrc", "muttrc"), ("procmailrc", "procmail"),
       ("vimrc", "vim"), ("gvimrc", "vim"),
-      ("init.py", "python"), ("init_old.py", "python"))
+      ("init.py", "python"), ("pdbrc", "python"), ("pdbrc.py", "python"))
 ft_len = len(file_types)
 
 for i, (fname, ftype) in enumerate(file_types):
    if os.path.exists('.' + fname) and not os.path.exists(fname):
       shutil.copy2('.' + fname, fname)
+   if fname == 'vimrc' and os.path.exists(fname):
+      file = open('vimrc', 'r')
+      text = file.read()
+      file.close()
+      file = open('vimrc', 'w')
+      file.write(text.replace('', '<Esc>'))
+      file.close()
    if os.path.exists(fname):
-      os.system("""exec gvim -f -c "set syntax=%s" -c ":source %s/dotfile2html.vim" "%s"
+      os.system("""exec gvim -f -c "set filetype=%s" -c ":source %s/dotfile2html.vim" "%s"
          """ % (ftype, home_dir, fname))
       if i == 0:
          prev = None
@@ -61,5 +76,10 @@ for i, (fname, ftype) in enumerate(file_types):
       else:
          next = file_types[i+1][0]
       add_headers(fname, prev, next)
-      os.rename(fname + ".html", fname + ".tmpl")
+      if os.path.exists(fname + ".tmpl") and filecmp.cmp(fname + ".html", fname + ".tmpl"):
+         os.remove(fname + ".html")
+      else:
+         os.rename(fname + ".html", fname + ".tmpl")
+   if fname == 'vimrc' and os.path.exists('.' + fname):
+      shutil.copy2('.' + fname, fname)
       os.chmod(fname, 0644)