Merge pull request #18 from theleagueof/docker-tweaks

Dockerfile

@@ -12,8 +12,8 @@ RUN pacman --needed --noconfirm -Syuq && yes | pacman -Sccq
 
 # Install fontship run-time dependecies
 RUN pacman --needed --noconfirm -Syq \
-		entr font-v gftools git libarchive make python sfnt2woff-zopfli ttfautohint zsh \
-		python-{brotli,click,defcon,font{make,tools},fs,lxml,ufo{2ft,normalizer},zopfli} \
+		entr font-v gftools git libarchive make python sfnt2woff-zopfli ttfautohint woff2 zsh \
+		python-{brotli,click,defcon,font{make,tools},fs,lxml,ufo{2ft,normalizer},unicodedata2,zopfli} \
 	&& yes | pacman -Sccq
 
 # Setup separate image to build fontship so we don't bloat the final image

src/rules.mk

@@ -12,6 +12,8 @@ SHELL := zsh
 .ONESHELL:
 .SECONDEXPANSION:
 
+CONTAINERIZED != test -f /.dockerenv && echo true || echo false
+
 # Initial environment setup
 FONTSHIPDIR != cd "$(shell dirname $(lastword $(MAKEFILE_LIST)))/" && pwd
 GITNAME := $(notdir $(shell git worktree list | head -n1 | awk '{print $$1}'))
@@ -29,7 +31,11 @@ FONTV ?= font-v
 PYTHON ?= python3
 
 # Read font name from metadata file or guess from repository name
-FontName ?= $(shell python -c 'print("$(PROJECT)".replace("-", " ").title())')
+FamilyName ?= $(shell $(CONTAINERIZED) || python -c 'print("$(PROJECT)".replace("-", " ").title())')
+
+ifeq ($(FamilyName),)
+$(error We cannot properly detect the font’s Family Name yet from inside Docker. Please manually specify it by adding FamilyName='Family Name' as an agument to your command invocation)
+endif
 
 # Determine font version automatically from repository git tags
 FontVersion ?= $(shell git describe --tags --abbrev=6 | sed 's/-.*//g')
@@ -38,7 +44,7 @@ GitVersion ?= $(shell git describe --tags --abbrev=6 | sed 's/-/-r/')
 isTagged := $(if $(subst $(FontVersion),,$(GitVersion)),,true)
 
 # Look for what fonts & styles are in this repository that will need building
-FontBase = $(subst $(space),,$(FontName))
+FontBase = $(subst $(space),,$(FamilyName))
 FontStyles = $(subst $(FontBase)-,,$(basename $(wildcard $(FontBase)-*.ufo)))
 FontStyles += $(foreach GLYPHS,$(wildcard $(FontBase).glyphs),$(call glyphWeights,$(GLYPHS)))
 
@@ -61,7 +67,7 @@ debug:
 	echo PROJECTDIR = $(PROJECTDIR)
 	echo PUBDIR = $(PUBDIR)
 	echo ----------------------------
-	echo FontName = $(FontName)
+	echo FamilyName = $(FamilyName)
 	echo FontBase: $(FontBase)
 	echo FontStyles: $(FontStyles)
 	echo FontVersion: $(FontVersion)
@@ -168,14 +174,14 @@ variable_ttf/%-VF.ttf: %.glyphs
 	$(normalizeVersion)
 
 instance_otf/$(FontBase)-%.otf: $(FontBase).glyphs
-	fontmake --master-dir '{tmp}' -g $< -i "$(FontName) $*" -o otf
+	fontmake --master-dir '{tmp}' -g $< -i "$(FamilyName) $*" -o otf
 
 %.otf: instance_otf/%.otf .last-commit
 	cp $< $@
 	$(normalizeVersion)
 
 instance_ttf/$(FontBase)-%.ttf: $(FontBase).glyphs
-	fontmake --master-dir '{tmp}' -g $< -i "$(FontName) $*" -o ttf
+	fontmake --master-dir '{tmp}' -g $< -i "$(FamilyName) $*" -o ttf
 	gftools fix-dsig --autofix $@
 
 %.ttf: instance_ttf/%.ttf .last-commit