|
Harald Hoyer |
3610a1 |
From 8f4f40cb3c1bdef99fe4c9ccb073068415c915ba Mon Sep 17 00:00:00 2001
|
|
Harald Hoyer |
3610a1 |
From: Harald Hoyer <harald@hoyer.xyz>
|
|
Harald Hoyer |
3610a1 |
Date: Mon, 18 Dec 2017 09:05:49 +0100
|
|
Harald Hoyer |
3610a1 |
Subject: [PATCH] Merge pull request #322 from danimo/font_maps
|
|
Harald Hoyer |
3610a1 |
|
|
Harald Hoyer |
3610a1 |
10i18n: Add correct fontmaps
|
|
Harald Hoyer |
3610a1 |
---
|
|
Harald Hoyer |
3610a1 |
modules.d/10i18n/module-setup.sh | 6 +++++-
|
|
Harald Hoyer |
3610a1 |
1 file changed, 5 insertions(+), 1 deletion(-)
|
|
Harald Hoyer |
3610a1 |
|
|
Harald Hoyer |
3610a1 |
diff --git a/modules.d/10i18n/module-setup.sh b/modules.d/10i18n/module-setup.sh
|
|
Harald Hoyer |
3610a1 |
index 7723f6fa..7320a919 100755
|
|
Harald Hoyer |
3610a1 |
--- a/modules.d/10i18n/module-setup.sh
|
|
Harald Hoyer |
3610a1 |
+++ b/modules.d/10i18n/module-setup.sh
|
|
Harald Hoyer |
3610a1 |
@@ -209,7 +209,11 @@ install() {
|
|
Harald Hoyer |
3610a1 |
if [[ ${FONT_MAP} ]]
|
|
Harald Hoyer |
3610a1 |
then
|
|
Harald Hoyer |
3610a1 |
FONT_MAP=${FONT_MAP%.trans}
|
|
Harald Hoyer |
3610a1 |
- inst_simple ${kbddir}/consoletrans/${FONT_MAP}.trans
|
|
Harald Hoyer |
3610a1 |
+ # There are three different formats that setfont supports
|
|
Harald Hoyer |
3610a1 |
+ inst_simple ${kbddir}/consoletrans/${FONT_MAP} \
|
|
Harald Hoyer |
3610a1 |
+ || inst_simple ${kbddir}/consoletrans/${FONT_MAP}.trans \
|
|
Harald Hoyer |
3610a1 |
+ || inst_simple ${kbddir}/consoletrans/${FONT_MAP}_to_uni.trans \
|
|
Harald Hoyer |
3610a1 |
+ || dwarn "Could not find FONT_MAP ${FONT_MAP}!"
|
|
Harald Hoyer |
3610a1 |
fi
|
|
Harald Hoyer |
3610a1 |
|
|
Harald Hoyer |
3610a1 |
if [[ ${FONT_UNIMAP} ]]
|
|
Harald Hoyer |
3610a1 |
|