X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;ds=sidebyside;f=dotfiles2html%2Fdotfiles2html.py;h=c3b42cabb944910d4f5c14a2f0744c4eeabb8656;hb=a36c760ac882d61b6f75a679cf8c1a212486da00;hp=4d4d0165bdb7cd90165bbf88bc2a90857835bc44;hpb=f35203d2c75c0b80b6a19b12e8383f7068ddd110;p=phdru.name%2Fphdru.name.git

diff --git a/dotfiles2html/dotfiles2html.py b/dotfiles2html/dotfiles2html.py
index 4d4d016..c3b42ca 100755
--- a/dotfiles2html/dotfiles2html.py
+++ b/dotfiles2html/dotfiles2html.py
@@ -1,13 +1,13 @@
-#! /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
+import os, shutil, filecmp
 os.umask(0022) # octal; -rw-r--r--
 
 from m_lib.m_path import get_homedir
@@ -47,18 +47,26 @@ 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"), ("init_old.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
@@ -69,5 +77,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)