diff --git a/Makefile b/Makefile index 05a7ecb..7f65362 100644 --- a/Makefile +++ b/Makefile @@ -12,13 +12,17 @@ v: dist: $(BUILD_DIR)/iosevka-prog-$(V).tar.xz -$(BUILD_DIR)/iosevka-prog-$(V).tar.xz: $(BUILD_DIR)/iosevka-prog/ttf/*.ttf - cd $(BUILD_DIR)/iosevka-prog/ttf; tar Jcf $(BUILD_DIR)/iosevka-prog-$(V).tar.xz *.ttf +$(BUILD_DIR)/iosevka-prog-$(V).tar.xz: $(BUILD_DIR)/iosevka-prog/ttf/iosevka-prog-$(V)/*.ttf + cd $(BUILD_DIR)/iosevka-prog/ttf/iosevka-prog-$(V); tar Jcf $(BUILD_DIR)/iosevka-prog-$(V).tar.xz *.ttf + +$(BUILD_DIR)/iosevka-prog-nerd-$(V).tar.xz: $(BUILD_DIR)/iosevka-prog/ttf/iosevka-prog-nerd-$(V)/*.ttf + cd $(BUILD_DIR)/iosevka-prog/ttf/iosevka-prog-nerd-$(V); tar Jcf $(BUILD_DIR)/iosevka-prog-nerd-$(V).tar.xz *.ttf upload: dist git tag $(V) gitea-tea r c --repo f1x1t/iosevka-prog-font-builder -t $(V) --tag $(V) \ - -a $(BUILD_DIR)/iosevka-prog-$(V).tar.xz + -a $(BUILD_DIR)/iosevka-prog-$(V).tar.xz \ + -a $(BUILD_DIR)/iosevka-prog-nerd-$(V).tar.xz git tag -d $(V) git push diff --git a/README.md b/README.md index 9c5320a..b439ef9 100644 --- a/README.md +++ b/README.md @@ -13,5 +13,5 @@ sudo apt-get install docker.io python3-fonttools Сборка шрифта выполняется командой `make`, результат сохраняется в каталог `dist`. -Готовый шрифт версии [25.1.1](../../../releases/download/25.1.1/iosevka-prog-25.1.1.tar.xz). +Готовый шрифт версии [26.0.0](../../../releases/download/26.0.0/iosevka-prog-26.0.0.tar.xz). diff --git a/build-iosevka-prog-font.sh b/build-iosevka-prog-font.sh index 8f6dc76..95be0f8 100755 --- a/build-iosevka-prog-font.sh +++ b/build-iosevka-prog-font.sh @@ -2,7 +2,7 @@ set -e -IOSEVKA_VERSION=25.1.1 +IOSEVKA_VERSION=26.0.0 FONT_NAME=iosevka-prog FILE=$( readlink -f "${BASH_SOURCE[0]}" ) DIR=$( dirname "${FILE}" ) @@ -28,13 +28,15 @@ if [ -r "${CONFIG}" ]; then cd "${OUT_DIR}" python3 "${DIR}/fontname.py" "Iosevka Prog Nerd Font" IosevkaProgNerdFont-Oblique.ttf python3 "${DIR}/fontname.py" "Iosevka Prog Nerd Font Mono" IosevkaProgNerdFontMono-Regular.ttf - tar acf "${DIST}/iosevka-prog-${IOSEVKA_VERSION}.tar.xz" *ttf mkdir -p "iosevka-prog-nerd-$IOSEVKA_VERSION" mv Iosevka*Nerd*ttf "iosevka-prog-nerd-$IOSEVKA_VERSION" - tar acf "${DIST}/fonts-iosevka-prog-nerd_${IOSEVKA_VERSION}.orig.tar.xz" "iosevka-prog-nerd-$IOSEVKA_VERSION" + tar acf "${DIST}/iosevka-prog-nerd-${IOSEVKA_VERSION}.tar.xz" "iosevka-prog-nerd-$IOSEVKA_VERSION" mkdir -p "iosevka-prog-$IOSEVKA_VERSION" mv iosevka*ttf "iosevka-prog-$IOSEVKA_VERSION" - tar acf "${DIST}/fonts-iosevka-prog_${IOSEVKA_VERSION}.orig.tar.xz" "iosevka-prog-$IOSEVKA_VERSION" + tar acf "${DIST}/iosevka-prog-${IOSEVKA_VERSION}.tar.xz" "iosevka-prog-$IOSEVKA_VERSION" + cd "${DIST}" + ln -s "iosevka-prog-nerd-${IOSEVKA_VERSION}.tar.xz" "fonts-iosevka-prog-nerd_${IOSEVKA_VERSION}.orig.tar.xz" + ln -s "iosevka-prog-${IOSEVKA_VERSION}.tar.xz" "fonts-iosevka-prog_${IOSEVKA_VERSION}.orig.tar.xz" else echo "Docker executable not found" fi