From 8d3af6f0909bae202520af9c77ae3b461289c555 Mon Sep 17 00:00:00 2001
From: Karl Semich <0xloem@gmail.com>
Date: Sat, 1 Oct 2016 13:31:22 -0400
Subject: Fix ikistrap "overwriting" files

---
 backend/resilient/__init__.py | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'backend')

diff --git a/backend/resilient/__init__.py b/backend/resilient/__init__.py
index 1a145ba..fc8c949 100644
--- a/backend/resilient/__init__.py
+++ b/backend/resilient/__init__.py
@@ -103,11 +103,9 @@ class ikiwiki:
       return True
 
     shutil.rmtree(html_path)
-    os.mkdir(html_path)
+    os.system("git checkout -- '%s'" % html_path)
 
     status = os.system("ikiwiki --setup '%s' '%s' '%s'" % (ikiwiki_setup_path, wiki_src_path, html_path))
-    # workaround for ikistrap overwriting custom css files, which are included for freenet's filter
-    os.system("git checkout -- '%s'/css" % html_path)
 
     ikiwiki.synced = (status == 0)
     if ikiwiki.synced:
-- 
cgit v1.2.3