From 4352e9b403b80b29907504abc638d1f4c069c14d Mon Sep 17 00:00:00 2001
From: Andrey Astafyev <dev@246060.ru>
Date: Mon, 24 Apr 2023 10:52:09 +0300
Subject: [PATCH] 22.1.0

---
 README.md                  |  2 +-
 build-iosevka-prog-font.sh | 12 +++++++++---
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index fe1c273..555efd2 100644
--- a/README.md
+++ b/README.md
@@ -12,5 +12,5 @@ sudo apt-get install docker.io
 
 Сборка шрифта выполняется командой `make`, результат сохраняется в каталог `dist`.
 
-Готовый шрифт версии [22.0.1](../../../releases/download/22.0.1/iosevka-prog-22.0.1.tar.xz).
+Готовый шрифт версии [22.1.0](../../../releases/download/22.1.0/iosevka-prog-22.1.0.tar.xz).
 
diff --git a/build-iosevka-prog-font.sh b/build-iosevka-prog-font.sh
index 6984fc6..71f8b72 100755
--- a/build-iosevka-prog-font.sh
+++ b/build-iosevka-prog-font.sh
@@ -2,7 +2,7 @@
 
 set -e
 
-IOSEVKA_VERSION=22.0.1
+IOSEVKA_VERSION=22.1.0
 FONT_NAME=iosevka-prog
 FILE=$( readlink -f "${BASH_SOURCE[0]}" )
 DIR=$( dirname "${FILE}" )
@@ -14,14 +14,20 @@ OUT_DIR="${DIST}/${FONT_NAME}/ttf"
 
 if [ -r "${CONFIG}" ]; then
 	if command -v docker >/dev/null 2>&1; then
+#		docker pull avivace/iosevka-docker
+		docker pull nerdfonts/patcher
 		docker run -e FONT_VERSION="${IOSEVKA_VERSION}" -it -v "$DIR":/build avivace/iosevka-build -- ttf::${FONT_NAME}
 		sudo chown -R "$(id -u)":"$(id -g)" "${DIST}"
 		mkdir -p "${OBLIQUE}"
 		cp -af "${OUT_DIR}/${FONT_NAME}-oblique.ttf" "${OBLIQUE}"
-		docker run -v "${OBLIQUE}":/in -v "${OUT_DIR}":/out nerdfonts/patcher --complete --careful --adjust-line-height && true
+		docker run -v "${OBLIQUE}":/in -v "${OUT_DIR}":/out nerdfonts/patcher --complete --careful --adjust-line-height --makegroups || true
 		mkdir -p "${REGULAR}"
 		cp -af "${OUT_DIR}/${FONT_NAME}-regular.ttf" "${REGULAR}"
-		docker run -v "${REGULAR}":/in -v "${OUT_DIR}":/out nerdfonts/patcher --complete --careful --adjust-line-height --mono --removeligatures && true
+		docker run -v "${REGULAR}":/in -v "${OUT_DIR}":/out nerdfonts/patcher --complete --careful --adjust-line-height --makegroups --mono --removeligatures || true
+		cd "${OUT_DIR}"
+		tar acf "${DIST}/fonts-iosevka-prog-nerd_${IOSEVKA_VERSION}.orig.tar.xz" Iosevka*Nerd*ttf
+		tar acf "${DIST}/fonts-iosevka-prog_${IOSEVKA_VERSION}.orig.tar.xz" iosevka*ttf
+		tar acf "${DIST}/iosevka-prog-${IOSEVKA_VERSION}.tar.xz" *ttf
 	else
 		echo "Docker executable not found"
 	fi