install.sh: fix font dir doubling

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 5232abf4eae7a072e04d6b9595a225fb5ce0f178..b28eb8138f758a567ce92a4494552e718ee3632e 100755 (executable)
--- 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 ] &&