From fc8b35d9fbb4ee1b29509094845b45e35fd2a887 Mon Sep 17 00:00:00 2001
From: Stefan Ritt <stefan.ritt@psi.ch>
Date: Fri, 5 Jun 2015 14:42:51 +0200
Subject: [PATCH] Adjusted installation scripts to take care of new CSS system

---
 Makefile |  8 +-------
 elog.nsi | 17 ++++++-----------
 2 files changed, 7 insertions(+), 18 deletions(-)

diff --git a/Makefile b/Makefile
index 254bd912..860b9f18 100644
--- a/Makefile
+++ b/Makefile
@@ -193,13 +193,7 @@ install: $(EXECS)
 	fi
 
 	@echo "Installing themes to $(ELOGDIR)/themes"
-	@$(INSTALL) -m 0644 themes/default/icons/* $(ELOGDIR)/themes/default/icons/
-	@for file in `find themes/default -type f` ;\
-          do \
-	    if [ ! -f $(ELOGDIR)/themes/default/`basename $$file` ]; then  \
-              $(INSTALL) -m 0644 $$file $(ELOGDIR)/themes/default/`basename $$file` ; \
-	    fi; \
-	  done
+	@$(INSTALL) -m 0644 themes/default/* $(ELOGDIR)/themes/default/
 
 	@echo "Installing example logbook to $(ELOGDIR)/logbooks/demo"
 	@if [ ! -f $(ELOGDIR)/logbooks/demo/2001 ]; then  \
diff --git a/elog.nsi b/elog.nsi
index ab88747d..016a9a97 100755
--- a/elog.nsi
+++ b/elog.nsi
@@ -111,17 +111,12 @@ Section "ELOG system (required)" SecSystem
 
   ; themes 
   SetOutPath $INSTDIR\themes\default
-
-  IfFileExists $INSTDIR\themes\default\default.css 0 themesNotExist
-    MessageBox MB_YESNO|MB_ICONQUESTION "Would you like to overwrite your existing theme files?" IDNO themesNotOverwrite
-  themesNotExist:
-    File themes\default\*.css
-    File themes\default\*.png
-    File themes\default\*.ico
-    File themes\default\*.png
-    SetOutPath $INSTDIR\themes\default\icons
-    File themes\default\icons\*.*
-  themesNotOverwrite:
+  File themes\default\*.css
+  File themes\default\*.png
+  File themes\default\*.ico
+  File themes\default\*.png
+  SetOutPath $INSTDIR\themes\default\icons
+  File themes\default\icons\*.*
 
   ; demo logbook
   IfFileExists $INSTDIR\logbooks\demo\2001\011108a.log 0 logbNotExist