From fc62e87c7f3c7e14d2a0f22d16074ff2ff17de51 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Haoran=20S=2E=20Diao=20=28=E5=88=81=E6=B5=A9=E7=84=B6=29?=
 <0@hairydiode.xyz>
Date: Fri, 30 Jun 2023 03:47:33 -0700
Subject: Added smarter font directory handling

---
 README | 2 ++
 fontd  | 5 ++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/README b/README
index 3b6e755..d5332b4 100644
--- a/README
+++ b/README
@@ -30,12 +30,14 @@ begin:
 examples are in INPUT and INPUT2
 
 ------------------------------------=[fontd]=-----------------------------------
+NOTE: When specifiying the font directory, do not leaving a trailing /
 Font Display:
 	prints font in braille characters, useful for limited environments such
 	as the linux console(although you would need braille support first),
 	takes as first argument a decimal codepoint (bdf format) and the 2nd a
 	directory with bdf fonts from which to find the character
 ------------------------------------=[textd]=-----------------------------------
+NOTE: When specifiying the font directory, do not leaving a trailing /
 Text Display:
 	Takes utf-8 input from stdin and displays it vertically with fonts
 	specified by the first argument
diff --git a/fontd b/fontd
index d6754d0..aecd636 100755
--- a/fontd
+++ b/fontd
@@ -4,9 +4,12 @@
 #		display CHAR if found in any bdf fonts in DIR/
 #		NOTE: CHAR must be in decimal encoding point format of bdf
 
+#expands ~ and *, it's a bit unsafe
+eval fonts="$2/*bdf"
+
 #gets font size, it can take multiple fonts as input so only get the first one
 #and assume they're all the same size
-size=$(cat $2/*bdf | grep -m 1 PIXEL_SIZE | awk '{print $2}')
+size=$(cat $fonts | grep -m 1 PIXEL_SIZE | awk '{print $2}')
 
 #get bdf bitmap info from bdf
 #fflag ensures only one result even with multiple bdfs, cflag finds the char,
-- 
cgit v1.1