From c499ad3d7f7269c952a40294ddecf5dc10e93f24 Mon Sep 17 00:00:00 2001 From: Oleg Broytman Date: Fri, 21 Aug 2020 10:19:52 +0300 Subject: [PATCH] Refactor(dotfiles2html): Reorder code blocks Process files in alphabetic order. --- dotfiles2html/dotfiles2html.py | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) 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 " -__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', '')) - 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', '')) + 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) -- 2.39.5