From 2febc2aafc3615d2cd769de801bcd2093a280ae6 Mon Sep 17 00:00:00 2001
From: Bryan Kok <bryan.wyern1@gmail.com>
Date: Sat, 27 Mar 2021 15:10:47 +0800
Subject: [PATCH] Move enable extended globbing into each run

No spaces in the file prefix of Gothic font

Don't remove the artifact archives at the end of each step

Fix yml globbing again
---
 .github/workflows/generate-fonts.yml | 29 +++++++++++++++-------------
 config_gothic_single.json            | 10 +++++-----
 2 files changed, 21 insertions(+), 18 deletions(-)

diff --git a/.github/workflows/generate-fonts.yml b/.github/workflows/generate-fonts.yml
index 9c7c5c8..d238d34 100644
--- a/.github/workflows/generate-fonts.yml
+++ b/.github/workflows/generate-fonts.yml
@@ -52,34 +52,37 @@ jobs:
       - run: sh fetch_svg_font.sh
 
       - run: gzip -d *.txt.gz
-      - run: shopt -s extglob
-      - run: sh clean.sh || exit 0
+      # - run: sh clean.sh || exit 0
       - name: Mincho SC
         run: |
           CONFIG=./config_mincho_single.json poetry run driver ./glyphwiki_dump/dump_newest_only.txt ./glyphwiki_mincho.txt ./perl-scripts g
-          zip HanaMinLiteSC.zip {Hana*.!(otf),GlyphWiki*}
-          rm {Hana*.!(otf),GlyphWiki*}
+          shopt -s extglob
+          zip HanaMinLiteSC.zip {Hana*.!(*@(otf|zip)),GlyphWiki*}
+          rm {Hana*.!(*@(otf|zip)),GlyphWiki*}
 
-      - run: sh clean.sh || exit 0
+      # - run: sh clean.sh || exit 0
       - name: Mincho TC CJK
         run: |
           CONFIG=./config_mincho.json poetry run driver ./glyphwiki_dump/dump_newest_only.txt ./glyphwiki_mincho.txt ./perl-scripts t
-          zip HanaMinLiteCJKTC.zip {Hana*.!(otf),GlyphWiki*}
-          rm {Hana*.!(otf),GlyphWiki*}
+          shopt -s extglob
+          zip HanaMinLiteCJKTC.zip {Hana*.!(*@(otf|zip)),GlyphWiki*}
+          rm {Hana*.!(*@(otf|zip)),GlyphWiki*}
 
-      - run: sh clean.sh || exit 0
+      # - run: sh clean.sh || exit 0
       - name: Gothic JP
         run: |
           CONFIG=./config_gothic_single.json poetry run driver ./glyphwiki_dump/dump_newest_only.txt ./glyphwiki_gothic.txt ./perl-scripts j
-          zip HanaGothLiteJP.zip {Hana*.!(otf),GlyphWiki*}
-          rm {Hana*.!(otf),GlyphWiki*}
+          shopt -s extglob
+          zip HanaGothLiteJP.zip {Hana*.!(*@(otf|zip)),GlyphWiki*}
+          rm {Hana*.!(*@(otf|zip)),GlyphWiki*}
 
-      - run: sh clean.sh || exit 0
+      # - run: sh clean.sh || exit 0
       - name: Gothic KR CJK
         run: |
           CONFIG=./config_gothic.json poetry run driver ./glyphwiki_dump/dump_newest_only.txt ./glyphwiki_mincho.txt ./perl-scripts t
-          zip HanaGothLiteCJKKR.zip {Hana*.!(otf),GlyphWiki*}
-          rm {Hana*.!(otf),GlyphWiki*}
+          shopt -s extglob
+          zip HanaGothLiteCJKKR.zip {Hana*.!(*@(otf|zip)),GlyphWiki*}
+          rm {Hana*.!(*@(otf|zip)),GlyphWiki*}
 
       - name: Release
         uses: softprops/action-gh-release@v1
diff --git a/config_gothic_single.json b/config_gothic_single.json
index 2c62ba3..2c016c7 100644
--- a/config_gothic_single.json
+++ b/config_gothic_single.json
@@ -5,7 +5,7 @@
   "family_name": "Hanazono Gothic Lite",
   "blocks": {
     "test": {
-      "prefix": "HanaGothLite Test",
+      "prefix": "HanaGothLiteTest",
       "full_name": "Hanazono Gothic Lite Test",
       "unicode_ranges": [
         ["89D0", "89D9"],
@@ -14,12 +14,12 @@
       ]
     },
     "A1": {
-      "prefix": "HanaGothLite A1",
+      "prefix": "HanaGothLiteA1",
       "full_name": "Hanazono Gothic Lite A1",
       "unicode_ranges": [["0000", "ABFF"]]
     },
     "A2": {
-      "prefix": "HanaGothLite A2",
+      "prefix": "HanaGothLiteA2",
       "full_name": "Hanazono Gothic Lite A2",
       "unicode_ranges": [
         ["AC00", "D7FF"],
@@ -28,12 +28,12 @@
       ]
     },
     "B": {
-      "prefix": "HanaGothLite B",
+      "prefix": "HanaGothLiteB",
       "full_name": "Hanazono Gothic Lite B",
       "unicode_ranges": [["20000", "2A6D6"]]
     },
     "C": {
-      "prefix": "HanaGothLite C",
+      "prefix": "HanaGothLiteC",
       "full_name": "Hanazono Gothic Lite C",
       "unicode_ranges": [
         ["2A700", "2FFFD"],