[PATCH] f_theme: add font path check
Export this patch
adds font path check to ensure compatability with more systems
---
scripts/f_theme | 21 +++++++++++++++------
1 file changed, 15 insertions(+), 6 deletions(-)
diff --git a/scripts/f_theme b/scripts/f_theme
index 83f902d..e167126 100755
--- a/scripts/f_theme
+++ b/scripts/f_theme
@@ -12,21 +12,20 @@ DOC="
used for {sm,md,lg}{white,dark}.
"
VAR='
- F_THEME_FONTSM="/usr/share/consolefonts/ter-114n.psf.gz"
- F_THEME_FONTMD="/usr/share/consolefonts/ter-920n.psf.gz"
- F_THEME_FONTLG="/usr/share/consolefonts/ter-v32n.psf.gz"
+ F_THEME_FONTSM="$FONTPATH/ter-114n.psf.gz"
+ F_THEME_FONTMD="$FONTPATH/ter-920n.psf.gz"
+ F_THEME_FONTLG="$FONTPATH/ter-v32n.psf.gz"
'
-
fontchange() {
local FONTS PICKED
- FONTS="$(ls -1 /usr/share/consolefonts/ | sed 's/.psf.gz//g' )"
+ FONTS="$(ls -1 $FONTPATH/ | sed 's/.psf.gz//g' )"
[ -p /tmp/fbp.fifo ] && echo -e "\b\fcancel\n$FONTS" > /tmp/fbp.fifo
echo "$FONTS"
echo "Pick a font:"
read -r PICKED
[ "$PICKED" = cancel ] && return
- setfont /usr/share/consolefonts/$PICKED.psf.gz
+ setfont $FONTPATH/$PICKED.psf.gz
[ -p /tmp/fbp.fifo ] && echo -e "\v" > /tmp/fbp.fifo
}
@@ -58,11 +57,21 @@ rotate() {
[ -p /tmp/fbp.fifo ] && echo -e "\v" > /tmp/fbp.fifo
}
+fontpath() {
+ if [[ -d /usr/share/consolefonts/ ]]; then
+ FONTPATH=/usr/share/consolefonts
+ elif [[ -d /usr/share/kbd/consolefonts/ ]]; then
+ FONTPATH=/usr/share/kbd/consolefonts
+ fi
+}
+
main() {
local RUN
env | grep -q "^$(basename "$0" | tr '[a-z]' '[A-Z]')=" || eval "$VAR"
+ fontpath
+
while true; do
OPTS="lgdark mddark smdark lgwhite mdwhite smwhite fontchange rotate"
[ -p /tmp/fbp.fifo ] && { echo -e "\b\f\r"; echo "$OPTS" | tr " " "\n"; } > /tmp/fbp.fifo
--
2.38.0