From: Oleg Broytman <phd@phdru.name>
Date: Fri, 21 Aug 2020 07:19:52 +0000 (+0300)
Subject: Refactor(dotfiles2html): Reorder code blocks
X-Git-Url: https://git.phdru.name/?a=commitdiff_plain;h=c499ad3d7f7269c952a40294ddecf5dc10e93f24;p=phdru.name%2Fphdru.name.git

Refactor(dotfiles2html): Reorder code blocks

Process files in alphabetic order.
---

diff --git a/dotfiles2html/dotfiles2html.py b/dotfiles2html/dotfiles2html.py
index 0125619..f18ff4a 100755
--- a/dotfiles2html/dotfiles2html.py
+++ b/dotfiles2html/dotfiles2html.py
@@ -1,7 +1,7 @@
 #! /usr/bin/env python
 
 __author__ = "Oleg Broytman <phd@phdru.name>"
-__copyright__ = "Copyright (C) 2004-2016 PhiloSoft Design"
+__copyright__ = "Copyright (C) 2004-2020 PhiloSoft Design"
 
 import os, shutil, filecmp
 os.umask(0022) # octal; -rw-r--r--
@@ -73,15 +73,7 @@ def process_dotfile(i, fname, ftype, file_types):
    if not os.path.exists(fname):
       return
 
-   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('\033', '<Esc>'))
-      file.close()
-
-   elif fname in ('mailcap', 'mc.ext', 'menu') and os.path.exists(fname):
+   if fname in ('mailcap', 'mc.ext', 'menu') and os.path.exists(fname):
       file = open(fname, 'r')
       text = file.read()
       file.close()
@@ -95,6 +87,14 @@ def process_dotfile(i, fname, ftype, file_types):
       file.write(text)
       file.close()
 
+   elif fname == 'vimrc' and os.path.exists(fname):
+      file = open('vimrc', 'r')
+      text = file.read()
+      file.close()
+      file = open('vimrc', 'w')
+      file.write(text.replace('\033', '<Esc>'))
+      file.close()
+
    os.system("""exec gvim -f -c "set filetype=%s" -c ":source %s/dotfile2html.vim" "%s"
       """ % (ftype, home_dir, fname))
 
@@ -115,14 +115,14 @@ def process_dotfile(i, fname, ftype, file_types):
    else:
       os.rename(fname + ".html", fname + ".tmpl")
 
-   if fname == 'vimrc' and os.path.exists('.' + fname):
-      shutil.copy2('.' + fname, fname)
-
    if fname.endswith('.py'):
        new_name = fname + '.txt'
        os.rename(fname, new_name)
        fname = new_name
 
+   if fname == 'vimrc' and os.path.exists('.' + fname):
+      shutil.copy2('.' + fname, fname)
+
    if os.path.exists(fname):
        os.chmod(fname, 0644)