Improved compatibility of CJK font installation on Alpine.

jlesage · Nov 30, 2024 · d5db45f · d5db45f
1 parent 06bb023
commit d5db45f
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/rootfs/etc/cont-init.d/15-cjk-font.sh b/rootfs/etc/cont-init.d/15-cjk-font.sh
@@ -9,8 +9,13 @@ if is-bool-val-true "${ENABLE_CJK_FONT:-0}"; then
         echo "CJK font already installed."
     else
         echo "installing CJK font..."
-        if [ -n "$(which apk)" ]; then
-            add-pkg font-wqy-zenhei --repository "${PACKAGES_MIRROR:-https://dl-cdn.alpinelinux.org/alpine}/edge/community"
+        if command -v apk >/dev/null; then
+            if apk --no-cache info font-wqy-zenhei > /dev/null
+            then
+                add-pkg font-wqy-zenhei
+            else
+                add-pkg font-wqy-zenhei --repository "${PACKAGES_MIRROR:-https://dl-cdn.alpinelinux.org/alpine}/v3.19/community"
+            fi
         else
             add-pkg fonts-wqy-zenhei
         fi