Fixed a bug.

[phdru.name/phdru.name.git] / dotfiles2html / dotfiles2html.py

diff --git a/dotfiles2html/dotfiles2html.py b/dotfiles2html/dotfiles2html.py
index 8952fe862931ed14f0aeff1672eb3ecfe5444e8d..491af24b2290441f75a3f8439c8aef6b5d982fdd 100755 (executable)
--- a/dotfiles2html/dotfiles2html.py
+++ b/dotfiles2html/dotfiles2html.py
@@ -1,10 +1,10 @@
-#! /usr/local/bin/python -O
+#! /usr/bin/env python
 
 __version__ = "$Revision$"[11:-2]
 __revision__ = "$Id$"[5:-2]
 __date__ = "$Date$"[7:-2]
-__author__ = "Oleg BroytMann <phd@phd.pp.ru>"
-__copyright__ = "Copyright (C) 2004-2006 PhiloSoft Design"
+__author__ = "Oleg Broytman <phd@phd.pp.ru>"
+__copyright__ = "Copyright (C) 2004-2009 PhiloSoft Design"
 
 
 import os, shutil, filecmp
@@ -47,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('\e', '<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
@@ -69,8 +76,11 @@ for i, (fname, ftype) in enumerate(file_types):
       else:
          next = file_types[i+1][0]
       add_headers(fname, prev, next)
-      if not filecmp.cmp(fname + ".html", fname + ".tmpl"):
-         os.rename(fname + ".html", fname + ".tmpl")
-      else:
+      if os.path.exists(fname + ".tmpl") and filecmp.cmp(fname + ".html", fname + ".tmpl"):
          os.remove(fname + ".html")
-      os.chmod(fname, 0644)
+      else:
+         os.rename(fname + ".html", fname + ".tmpl")
+   if fname == 'vimrc' and os.path.exists('.' + fname):
+      shutil.copy2('.' + fname, fname)
+   if os.path.exists(fname):
+       os.chmod(fname, 0644)