Commit ae361bf8 authored by Xavier Guimard's avatar Xavier Guimard

Better fix for portal installation (#1333)

parent 661a54aa
Pipeline #427 failed with stages
in 4 minutes and 58 seconds
...@@ -685,7 +685,7 @@ install_portal_site: install_conf_dir ...@@ -685,7 +685,7 @@ install_portal_site: install_conf_dir
$(RCRONDIR) $(RCONFDIR) $(RCRONDIR) $(RCONFDIR)
@cp -pR -f $(SRCPORTALDIR)/site/htdocs/index.* $(RPORTALSITEDIR) @cp -pR -f $(SRCPORTALDIR)/site/htdocs/index.* $(RPORTALSITEDIR)
@cp -pR -f $(SRCPORTALDIR)/site/htdocs/static/* $(RPORTALSTATICDIR) @cp -pR -f $(SRCPORTALDIR)/site/htdocs/static/* $(RPORTALSTATICDIR)
cd $(SRCPORTALDIR)/site/templates; for f in `find * -type f`; do \ @cd $(SRCPORTALDIR)/site/templates; for f in `find * -type f -name '*.tpl'`; do \
echo "$$f => $(RPORTALTEMPLATESDIR)/$$f"; \ echo "$$f => $(RPORTALTEMPLATESDIR)/$$f"; \
mkdir -p $(RPORTALTEMPLATESDIR)/`dirname $$f`; \ mkdir -p $(RPORTALTEMPLATESDIR)/`dirname $$f`; \
../../../scripts/transform-templates \ ../../../scripts/transform-templates \
...@@ -695,7 +695,11 @@ install_portal_site: install_conf_dir ...@@ -695,7 +695,11 @@ install_portal_site: install_conf_dir
cssminified $(CSSCOMPRESS) <$$f \ cssminified $(CSSCOMPRESS) <$$f \
>$(RPORTALTEMPLATESDIR)/$$f; \ >$(RPORTALTEMPLATESDIR)/$$f; \
done; cd - done; cd -
cd $(SRCPORTALDIR)/site/templates; for l in `find * -type l`; do \ @cd $(SRCPORTALDIR)/site/templates; for f in `find * -type f ! -name '*.tpl'`; do \
mkdir -p $(RPORTALTEMPLATESDIR)/`dirname $$f`; \
install -v $$f $(RPORTALTEMPLATESDIR)/$$f; \
done; cd -
@cd $(SRCPORTALDIR)/site/templates; for l in `find * -type l`; do \
echo link to do $$l `readlink $$l`; \ echo link to do $$l `readlink $$l`; \
target=`readlink $$l`; \ target=`readlink $$l`; \
cd $(RPORTALTEMPLATESDIR); \ cd $(RPORTALTEMPLATESDIR); \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment