From 4b556819d52a3be8becb869fcfd23d60af544f4d Mon Sep 17 00:00:00 2001 From: sev Date: Mon, 4 Mar 2024 11:46:13 -0600 Subject: [PATCH] install.sh: fix font dir doubling --- gui/fonts/Dina/{ => pcf}/Dina_i400-10.pcf.gz | Bin gui/fonts/Dina/{ => pcf}/Dina_i400-8.pcf.gz | Bin gui/fonts/Dina/{ => pcf}/Dina_i400-9.pcf.gz | Bin gui/fonts/Dina/{ => pcf}/Dina_i700-10.pcf.gz | Bin gui/fonts/Dina/{ => pcf}/Dina_i700-8.pcf.gz | Bin gui/fonts/Dina/{ => pcf}/Dina_i700-9.pcf.gz | Bin gui/fonts/Dina/{ => pcf}/Dina_r400-10.pcf.gz | Bin gui/fonts/Dina/{ => pcf}/Dina_r400-6.pcf.gz | Bin gui/fonts/Dina/{ => pcf}/Dina_r400-8.pcf.gz | Bin gui/fonts/Dina/{ => pcf}/Dina_r400-9.pcf.gz | Bin gui/fonts/Dina/{ => pcf}/Dina_r700-10.pcf.gz | Bin gui/fonts/Dina/{ => pcf}/Dina_r700-8.pcf.gz | Bin gui/fonts/Dina/{ => pcf}/Dina_r700-9.pcf.gz | Bin gui/fonts/Dina/{ => pcf}/LICENSE | 0 gui/fonts/Dina/{ => pcf}/NEWS | 0 gui/fonts/{Dina-ttf => Dina/ttf}/Dina.ttf | Bin gui/fonts/{Dina-ttf => Dina/ttf}/LICENSE | 0 install.sh | 2 +- 18 files changed, 1 insertion(+), 1 deletion(-) rename gui/fonts/Dina/{ => pcf}/Dina_i400-10.pcf.gz (100%) rename gui/fonts/Dina/{ => pcf}/Dina_i400-8.pcf.gz (100%) rename gui/fonts/Dina/{ => pcf}/Dina_i400-9.pcf.gz (100%) rename gui/fonts/Dina/{ => pcf}/Dina_i700-10.pcf.gz (100%) rename gui/fonts/Dina/{ => pcf}/Dina_i700-8.pcf.gz (100%) rename gui/fonts/Dina/{ => pcf}/Dina_i700-9.pcf.gz (100%) rename gui/fonts/Dina/{ => pcf}/Dina_r400-10.pcf.gz (100%) rename gui/fonts/Dina/{ => pcf}/Dina_r400-6.pcf.gz (100%) rename gui/fonts/Dina/{ => pcf}/Dina_r400-8.pcf.gz (100%) rename gui/fonts/Dina/{ => pcf}/Dina_r400-9.pcf.gz (100%) rename gui/fonts/Dina/{ => pcf}/Dina_r700-10.pcf.gz (100%) rename gui/fonts/Dina/{ => pcf}/Dina_r700-8.pcf.gz (100%) rename gui/fonts/Dina/{ => pcf}/Dina_r700-9.pcf.gz (100%) rename gui/fonts/Dina/{ => pcf}/LICENSE (100%) rename gui/fonts/Dina/{ => pcf}/NEWS (100%) rename gui/fonts/{Dina-ttf => Dina/ttf}/Dina.ttf (100%) rename gui/fonts/{Dina-ttf => Dina/ttf}/LICENSE (100%) diff --git a/gui/fonts/Dina/Dina_i400-10.pcf.gz b/gui/fonts/Dina/pcf/Dina_i400-10.pcf.gz similarity index 100% rename from gui/fonts/Dina/Dina_i400-10.pcf.gz rename to gui/fonts/Dina/pcf/Dina_i400-10.pcf.gz diff --git a/gui/fonts/Dina/Dina_i400-8.pcf.gz b/gui/fonts/Dina/pcf/Dina_i400-8.pcf.gz similarity index 100% rename from gui/fonts/Dina/Dina_i400-8.pcf.gz rename to gui/fonts/Dina/pcf/Dina_i400-8.pcf.gz diff --git a/gui/fonts/Dina/Dina_i400-9.pcf.gz b/gui/fonts/Dina/pcf/Dina_i400-9.pcf.gz similarity index 100% rename from gui/fonts/Dina/Dina_i400-9.pcf.gz rename to gui/fonts/Dina/pcf/Dina_i400-9.pcf.gz diff --git a/gui/fonts/Dina/Dina_i700-10.pcf.gz b/gui/fonts/Dina/pcf/Dina_i700-10.pcf.gz similarity index 100% rename from gui/fonts/Dina/Dina_i700-10.pcf.gz rename to gui/fonts/Dina/pcf/Dina_i700-10.pcf.gz diff --git a/gui/fonts/Dina/Dina_i700-8.pcf.gz b/gui/fonts/Dina/pcf/Dina_i700-8.pcf.gz similarity index 100% rename from gui/fonts/Dina/Dina_i700-8.pcf.gz rename to gui/fonts/Dina/pcf/Dina_i700-8.pcf.gz diff --git a/gui/fonts/Dina/Dina_i700-9.pcf.gz b/gui/fonts/Dina/pcf/Dina_i700-9.pcf.gz similarity index 100% rename from gui/fonts/Dina/Dina_i700-9.pcf.gz rename to gui/fonts/Dina/pcf/Dina_i700-9.pcf.gz diff --git a/gui/fonts/Dina/Dina_r400-10.pcf.gz b/gui/fonts/Dina/pcf/Dina_r400-10.pcf.gz similarity index 100% rename from gui/fonts/Dina/Dina_r400-10.pcf.gz rename to gui/fonts/Dina/pcf/Dina_r400-10.pcf.gz diff --git a/gui/fonts/Dina/Dina_r400-6.pcf.gz b/gui/fonts/Dina/pcf/Dina_r400-6.pcf.gz similarity index 100% rename from gui/fonts/Dina/Dina_r400-6.pcf.gz rename to gui/fonts/Dina/pcf/Dina_r400-6.pcf.gz diff --git a/gui/fonts/Dina/Dina_r400-8.pcf.gz b/gui/fonts/Dina/pcf/Dina_r400-8.pcf.gz similarity index 100% rename from gui/fonts/Dina/Dina_r400-8.pcf.gz rename to gui/fonts/Dina/pcf/Dina_r400-8.pcf.gz diff --git a/gui/fonts/Dina/Dina_r400-9.pcf.gz b/gui/fonts/Dina/pcf/Dina_r400-9.pcf.gz similarity index 100% rename from gui/fonts/Dina/Dina_r400-9.pcf.gz rename to gui/fonts/Dina/pcf/Dina_r400-9.pcf.gz diff --git a/gui/fonts/Dina/Dina_r700-10.pcf.gz b/gui/fonts/Dina/pcf/Dina_r700-10.pcf.gz similarity index 100% rename from gui/fonts/Dina/Dina_r700-10.pcf.gz rename to gui/fonts/Dina/pcf/Dina_r700-10.pcf.gz diff --git a/gui/fonts/Dina/Dina_r700-8.pcf.gz b/gui/fonts/Dina/pcf/Dina_r700-8.pcf.gz similarity index 100% rename from gui/fonts/Dina/Dina_r700-8.pcf.gz rename to gui/fonts/Dina/pcf/Dina_r700-8.pcf.gz diff --git a/gui/fonts/Dina/Dina_r700-9.pcf.gz b/gui/fonts/Dina/pcf/Dina_r700-9.pcf.gz similarity index 100% rename from gui/fonts/Dina/Dina_r700-9.pcf.gz rename to gui/fonts/Dina/pcf/Dina_r700-9.pcf.gz diff --git a/gui/fonts/Dina/LICENSE b/gui/fonts/Dina/pcf/LICENSE similarity index 100% rename from gui/fonts/Dina/LICENSE rename to gui/fonts/Dina/pcf/LICENSE diff --git a/gui/fonts/Dina/NEWS b/gui/fonts/Dina/pcf/NEWS similarity index 100% rename from gui/fonts/Dina/NEWS rename to gui/fonts/Dina/pcf/NEWS diff --git a/gui/fonts/Dina-ttf/Dina.ttf b/gui/fonts/Dina/ttf/Dina.ttf similarity index 100% rename from gui/fonts/Dina-ttf/Dina.ttf rename to gui/fonts/Dina/ttf/Dina.ttf diff --git a/gui/fonts/Dina-ttf/LICENSE b/gui/fonts/Dina/ttf/LICENSE similarity index 100% rename from gui/fonts/Dina-ttf/LICENSE rename to gui/fonts/Dina/ttf/LICENSE diff --git a/install.sh b/install.sh index 5232abf..b28eb81 100755 --- a/install.sh +++ b/install.sh @@ -98,7 +98,7 @@ find gui -mindepth 1 -maxdepth 1 | while read -r y; do done ;; fonts) - find "$y" -mindepth 1 -maxdepth 2 -type d | while read -r x; do + find "$y" -mindepth 2 -maxdepth 2 -type d | while read -r x; do command -v mkfontscale >$devnull 2>&1 && mkfontscale "$x" command -v mkfontdir >$devnull 2>&1 && mkfontdir "$x" [ "$(head -1 "$x/fonts.scale" >$devnull 2>&1)" = 0 ] && -- 2.47.0