Adjusted installation scripts to take care of new CSS system

This commit is contained in:
2015-06-05 14:42:51 +02:00
parent e7ba64e370
commit fc8b35d9fb
2 changed files with 7 additions and 18 deletions
+1 -7
View File
@@ -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 \
+6 -11
View File
@@ -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