[oe-commits] org.oe.dev opie-ttf-support: add 02qtttffont-update and move everything possible from the bb file there

[Laibsch commit]

opie-ttf-support: add 02qtttffont-update and move everything possible from the bb file there
* improves readability and robustness
* closes 3720 together with e25947a6e6d2be708fd836b7d5209a3d074a28a5 from xjqian

Author: Laibsch at openembedded.org
Branch: org.openembedded.dev
Revision: 47b75b678cf4bede24082e551e04f186734a008c
ViewMTN: http://monotone.openembedded.org/revision/info/47b75b678cf4bede24082e551e04f186734a008c
Files:
1
packages/opie-ttf-support/files/02qtttffont-update
packages/opie-ttf-support/opie-ttf-support_1.1.bb
Diffs:

#
# mt diff -r8dd7d29f0da3c4c87ff0ef94c7df47e4e243f4dd -r47b75b678cf4bede24082e551e04f186734a008c
#
# 
# 
# add_file "packages/opie-ttf-support/files/02qtttffont-update"
#  content [760cb477c6a25abd5bf01d325d8eacffa61e88a2]
# 
# patch "packages/opie-ttf-support/opie-ttf-support_1.1.bb"
#  from [31bd2beed5a8228f8da31953542c42edf4b43385]
#    to [9f56a6e0e49a3248be7e931114742faffcfe2495]
# 
============================================================
--- packages/opie-ttf-support/files/02qtttffont-update	760cb477c6a25abd5bf01d325d8eacffa61e88a2
+++ packages/opie-ttf-support/files/02qtttffont-update	760cb477c6a25abd5bf01d325d8eacffa61e88a2
@@ -0,0 +1,6 @@
+#!/bin/sh
+# Author: Rolf Leggewie
+
+mkdir -p @@PALMTOPDIR@@/lib/fonts
+
+@@SBINDIR@@/update-qtttffontdir @@DATADIR@@/fonts/truetype > @@PALMTOPDIR@@/lib/fonts/fontdir
============================================================
--- packages/opie-ttf-support/opie-ttf-support_1.1.bb	31bd2beed5a8228f8da31953542c42edf4b43385
+++ packages/opie-ttf-support/opie-ttf-support_1.1.bb	9f56a6e0e49a3248be7e931114742faffcfe2495
@@ -1,9 +1,10 @@ DEPENDS = "freetype"
 DESCRIPTION = "Meta-package for Opie TTF support"
 SECTION = "opie/fonts"
 DEPENDS = "freetype"
-PR = "r4"
+PR = "r5"
 
-SRC_URI = "file://update-qtttffontdir.c"
+SRC_URI = "file://update-qtttffontdir.c \
+           file://02qtttffont-update"
 S = "${WORKDIR}"
 
 do_compile() {
@@ -11,23 +12,15 @@ do_install() {
 }
 
 do_install() {
-
-        echo "
-#!/bin/sh
-# Author: Rolf Leggewie
-
-${sbindir}/update-qtttffontdir ${datadir}/fonts/truetype > ${palmtopdir}/lib/fonts/fontdir
-" > ${WORKDIR}/02qtttffont-update
-
         install -d ${D}${sbindir}
         install -d ${D}${sysconfdir}/update-fonts-common.d/
         install -m 0755 update-qtttffontdir ${D}${sbindir}
         install -m 0755 02qtttffont-update ${D}${sysconfdir}/update-fonts-common.d/
+        sed -i 's!@@SBINDIR@@!${sbindir}!g' ${D}${sysconfdir}/update-fonts-common.d/02qtttffont-update
+        sed -i 's!@@PALMTOPDIR@@!${palmtopdir}!g' ${D}${sysconfdir}/update-fonts-common.d/02qtttffont-update
+        sed -i 's!@@DATADIR@@!${datadir}!g' ${D}${sysconfdir}/update-fonts-common.d/02qtttffont-update
 }
 
 pkg_postinst() {
-        if ! [ -d ${palmtopdir}/lib/fonts ]; then
-            mkdir -p ${palmtopdir}/lib/fonts
-        fi
         ${sysconfdir}/update-fonts-common.d/02qtttffont-update
 }