tidy up preflight and preflightg

silnrsi · Mar 8, 2018 · c9f819f · c9f819f
1 parent ccbdb3c
commit c9f819f
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 16 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -42,6 +42,7 @@
 *.xml text eol=lf
 
 preflight text eol=lf
+preflightg text eol=lf
 wscript text eol=lf
 
 # Declare text files that will stay in LF (i.e. not expected to be used on Windows)

diff --git a/preflight b/preflight
@@ -3,10 +3,10 @@
 # Place this in root of a project, adjust the font path, then set it to be executable by typing:
 # chmod +x preflight
 
-# This section contains commands used occasionally
-# psfsetpsnames -i tools/data/glyph_data.csv  source/Akatab-Regular_beta.ufo
+echo
+echo "Setting glyph order..."
+psfsetglyphorder -p checkfix=none -i source/glyphorder.txt source/AwamiNastaliq-Regular.ufo
 
-# This section contains commands that run every time
-psfsetglyphorder -i source/glyphorder.txt source/AwamiNastaliq-Regular.ufo
-
-psfnormalize source/AwamiNastaliq-Regular.ufo
+echo
+echo "Normalising UFO..."
+psfnormalize -p checkfix=fix source/AwamiNastaliq-Regular.ufo
diff --git a/preflightg b/preflightg
@@ -3,18 +3,10 @@
 # Place this in root of a project, adjust the font path, then set it to be executable by typing:
 # chmod +x preflight
 
-# This section contains commands used occasionally
-# psfsetpsnames -i tools/data/glyph_data.csv  source/Akatab-Regular_beta.ufo
-
 # This section contains commands that run every time
 echo
 echo "Converting Glyphs to UFO3..."
 psfglyphs2ufo source/AwamiNastaliq-Regular.glyphs source
 
-echo
-echo "Setting glyph order..."
-psfsetglyphorder -p checkfix=none -i source/glyphorder.txt source/AwamiNastaliq-Regular.ufo
-
-echo
-echo "Normalising UFO..."
-psfnormalize -p checkfix=fix source/AwamiNastaliq-Regular.ufo
+# Continue with normal preflight
+./preflight