From 91be759f8aaf1ee23ccf14c9fd692f319f9d690f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= Date: Fri, 8 Mar 2019 03:31:35 +0100 Subject: [PATCH] themes: fix paths and symlink fonts --- haiku-data/themes/themes-1.0~git.recipe | 26 ++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/haiku-data/themes/themes-1.0~git.recipe b/haiku-data/themes/themes-1.0~git.recipe index effa63f59..d1bc0a280 100644 --- a/haiku-data/themes/themes-1.0~git.recipe +++ b/haiku-data/themes/themes-1.0~git.recipe @@ -10,7 +10,7 @@ can be extended. HOMEPAGE="https://github.com/mmuman/HaikuThemes" COPYRIGHT="2000-2019 François Revol" LICENSE="MIT" -REVISION="1" +REVISION="2" srcGitRev="35017d4ef1099f1bc4114b47fec9cfca0dff4816" SOURCE_URI="$HOMEPAGE/archive/$srcGitRev.tar.gz" CHECKSUM_SHA256="fda488324d67ee6a77cb5cb69a1a769184089135fa3f43f117bbc6fe0bedb1db" @@ -69,7 +69,6 @@ INSTALL() { cd UIThemes mkdir -p $dataDir/UIThemes - ls -l themes_base="Haiku Citrus gonxish Matrix2 moz-modern nucleo Olive smoke win2k" themes_tunetracker="TuneTracker" themes_stargate="AOS-Lantean Stargate_Atlantis Stargate_Atlantis_Ancient" @@ -78,20 +77,25 @@ INSTALL() cp -R "$t" "$dataDir/UIThemes/" done - tpaths="" + paths_tunetracker="" for t in ${themes_tunetracker}; do - tpaths="$tpath $dataDir/UIThemes/$t" + paths_tunetracker="$paths_tunetracker $dataDir/UIThemes/$t" done - echo "$tpaths" packageEntries tunetracker \ - $tpaths + $paths_tunetracker - tpaths="" - for t in ${themes_stargate}; do - tpaths="$tpath $dataDir/UIThemes/$t" + paths_stargate="" + # symlink fonts + mkdir -p "$fontsDir/ttfonts" + for t in "$dataDir/UIThemes/Stargate_Atlantis/Stargate Atlantis Base/SGA Fonts"/*; do + fp="$(basename "$t")" + ln -s "$t" "$fontsDir/ttfonts/$fp" + paths_stargate="$paths_stargate $fontsDir/ttfonts/$fp" + done + for t in ${themes_stargate}; do + paths_stargate="$paths_stargate $dataDir/UIThemes/$t" done - echo "$tpaths" packageEntries stargate \ - $tpaths + $paths_stargate }