Merge mkfontdir/mkfontscale hooks to single pair of hooks.

Instead of using a new hook for each font dir, teach one hook to loop through each font dir.
eli-schwartz · Mar 17, 2016 · 1f5b1b3 · 1f5b1b3
1 parent 71e6805
commit 1f5b1b3
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 44 deletions.
diff --git a/hooks/mkfontdir-otf.hook b/hooks/mkfontdir-otf.hook
diff --git a/hooks/mkfontdir-ttf.hook b/hooks/mkfontdir-ttf.hook
diff --git a/hooks/mkfontdir.hook b/hooks/mkfontdir.hook
@@ -0,0 +1,13 @@
+[Trigger]
+Type = File
+Operation = Install
+Operation = Upgrade
+Operation = Remove
+Target = usr/share/fonts/*/
+Target = !usr/share/fonts/*/*/
+
+[Action]
+Description = Indexing fonts...
+When = PostTransaction
+Exec = /bin/bash -c 'while read line; do mkfontdir $line; done'
+NeedsTargets
diff --git a/hooks/mkfontscale-otf.hook b/hooks/mkfontscale-otf.hook
diff --git a/hooks/mkfontscale-ttf.hook b/hooks/mkfontscale-ttf.hook
diff --git a/hooks/mkfontscale.hook b/hooks/mkfontscale.hook
@@ -0,0 +1,13 @@
+[Trigger]
+Type = File
+Operation = Install
+Operation = Upgrade
+Operation = Remove
+Target = usr/share/fonts/*/
+Target = !usr/share/fonts/*/*/
+
+[Action]
+Description = Indexing scalable fonts...
+When = PostTransaction
+Exec = /bin/bash -c 'while read line; do mkfontscale $line; done'
+NeedsTargets