opie-ttf-support: add 02qtttffont-update and move everything possible from the bb...

* improves readability and robustness
* closes 3720 together with e25947a6e6d2be708fd836b7d5209a3d074a28a5 from xjqian

diff --git a/packages/opie-ttf-support/files/02qtttffont-update b/packages/opie-ttf-support/files/02qtttffont-update
new file mode 100644 (file)
index 0000000..8f8058f
--- /dev/null
+++ b/packages/opie-ttf-support/files/02qtttffont-update
@@ -0,0 +1,6 @@
+#!/bin/sh
+# Author: Rolf Leggewie
+
+mkdir -p @@PALMTOPDIR@@/lib/fonts
+
+@@SBINDIR@@/update-qtttffontdir @@DATADIR@@/fonts/truetype > @@PALMTOPDIR@@/lib/fonts/fontdir

diff --git a/packages/opie-ttf-support/opie-ttf-support_1.1.bb b/packages/opie-ttf-support/opie-ttf-support_1.1.bb
index c6ed53f..18ce7ac 100644 (file)
--- a/packages/opie-ttf-support/opie-ttf-support_1.1.bb
+++ b/packages/opie-ttf-support/opie-ttf-support_1.1.bb
@@ -1,9 +1,10 @@
 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_compile() {
 }
 
 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
 }