From 8ba763bf5abbea6b2493737d72073d4d170b977f Mon Sep 17 00:00:00 2001 From: Marko Mackic Date: Sat, 21 Jan 2017 05:20:15 +0100 Subject: [PATCH] Folders overwrite, shaarli.png added to static files --- setup.py | 7 ++++++- static/themes/default/icons/shaarli.png | Bin 0 -> 5456 bytes 2 files changed, 6 insertions(+), 1 deletion(-) create mode 100644 static/themes/default/icons/shaarli.png diff --git a/setup.py b/setup.py index dc1bba229..fb51042ee 100755 --- a/setup.py +++ b/setup.py @@ -22,6 +22,7 @@ Plinth setup file from distutils import log from distutils.command.build import build +from distutils.dir_util import remove_tree from distutils.command.clean import clean from distutils.command.install_data import install_data from distutils.core import Command @@ -112,6 +113,7 @@ class CustomClean(clean): """Execute clean command""" subprocess.check_call(['rm', '-rf', 'Plinth.egg-info/']) subprocess.check_call(['make', '-C', 'doc', 'clean']) + for dir_path, dir_names, file_names in os.walk('plinth/locale/'): for file_name in file_names: if file_name.endswith('.mo'): @@ -139,8 +141,11 @@ class CustomInstallData(install_data): log.info("creating directory '%s'", directory) os.makedirs(directory) - # Recursively copy directories + # Recursively overwrite directories for target, source in DIRECTORIES_TO_COPY: + + remove_tree(target) + if self.root: target = change_root(self.root, target) diff --git a/static/themes/default/icons/shaarli.png b/static/themes/default/icons/shaarli.png new file mode 100644 index 0000000000000000000000000000000000000000..f8b0c94f24c0924d453592686c2a8d7170acc99b GIT binary patch literal 5456 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 literal 0 HcmV?d00001