diff --git a/homepage/cwsvJudo/Makefile.heliohost b/homepage/cwsvJudo/Makefile.heliohost index a1a84b5..35ca085 100644 --- a/homepage/cwsvJudo/Makefile.heliohost +++ b/homepage/cwsvJudo/Makefile.heliohost @@ -50,17 +50,23 @@ installDependencies: # cd submodules/bulma-templates; git fetch; git checkout 0.9.4.2; # - materialize-css if [ ! -d "submodules/materialize" ]; then cd submodules; git clone https://github.com/materializecss/materialize; fi - cd submodules/materialize; git fetch; git checkout $(VERSION_MATERIALIZE); npm install; npm audit fix; npm run release; + cd submodules/materialize; git fetch; git checkout -f $(VERSION_MATERIALIZE); npm install; npm audit fix; npm run release; # - google material icons - if [ ! -d "submodules/material-design-icons" ]; then cd submodules; git clone --filter=tree:0 https://github.com/google/material-design-icons.git; fi - cd submodules/material-design-icons; git fetch; git checkout $(VERSION_GOOGLE_MATERIAL_ICONS); +# - create target directory +# - download the compressed release +# - unpack fonts (and only the fonts) + if [ ! -d submodules/material-design-icons/material-design-icons-$(GOOGLE_MATERIAL_ICONS_VERSION)/font ]; then \ + mkdir -p submodules/material-design-icons;\ + curl -L https://github.com/google/material-design-icons/archive/refs/tags/$(GOOGLE_MATERIAL_ICONS_VERSION).tar.gz --output submodules/material-design-icons/$(GOOGLE_MATERIAL_ICONS_VERSION).tar.gz;\ + tar xf submodules/material-design-icons/$(GOOGLE_MATERIAL_ICONS_VERSION).tar.gz --directory submodules/material-design-icons material-design-icons-$(GOOGLE_MATERIAL_ICONS_VERSION)/font;\ + fi # - lazyload (load small sized placeholder image before loading large full quality image) if [ ! -d "submodules/lazysizes" ]; then cd submodules; git clone https://github.com/aFarkas/lazysizes.git; fi cd submodules/lazysizes; git checkout $(VERSION_LAZYSIZES) # copy/link all together to get a "distributable" package -# (distributable means: That directory can be uploaded va ftp) +# (distributable means: That directory can be uploaded via ftp) .PHONY: dist dist: all rm -rf $(distDir) @@ -137,7 +143,7 @@ dist: all # fonts mkdir -p $(distDir)/httpdocs/ressourcen/fonts find ./res/fonts -type f -exec $(LN) {} $(distDir)/httpdocs/ressourcen/fonts \; - find ./submodules/google-material-icons/material-design-icons-$(GOOGLE_MATERIAL_ICONS_VERSION)/font/ -type f -exec $(LN) {} $(distDir)/httpdocs/ressourcen/fonts \; + find ./submodules/material-design-icons/material-design-icons-$(GOOGLE_MATERIAL_ICONS_VERSION)/font/ -type f -exec $(LN) {} $(distDir)/httpdocs/ressourcen/fonts \; # htaccess $(LN) ./src/htaccess/heliohost/.htaccess $(distDir)/httpdocs/.htaccess @@ -153,7 +159,7 @@ dist: all $(LN) configs/heliohost/secrets.json $(distDir)/.local/secrets.json $(LN) configs/local/db.config.php $(distDir)/.local/db.config.php - docker-compose restart +# docker-compose restart .PHONY: pages pages: Makefile.heliohost.config $(pandocTemplate) $(phpFiles) diff --git a/homepage/cwsvJudo/Makefile.heliohost.config b/homepage/cwsvJudo/Makefile.heliohost.config index 0175e94..f8897e3 100644 --- a/homepage/cwsvJudo/Makefile.heliohost.config +++ b/homepage/cwsvJudo/Makefile.heliohost.config @@ -5,7 +5,7 @@ pandocTemplate = pandocTemplate/materialize-parallax.pandocTemplate # versions (git branches) to use -VERSION_MATERIALIZE = v2.1.1 +VERSION_MATERIALIZE = v2.2.2 # version of google material icons to use GOOGLE_MATERIAL_ICONS_URL = https://github.com/google/material-design-icons GOOGLE_MATERIAL_ICONS_VERSION = 4.0.0