Update fontdir tool to default to /opt/QtPalmtop, and update postinsts on the font packages to source /etc/profile prior to attempting to execute update-qtfontdir, which isnt necessarily in the path at the time of execution.

7 files changed, 13 insertions, 1 deletions

diff --git a/qt/control/qpf-cyberbit-120-50-t10.postinst b/qt/control/qpf-cyberbit-120-50-t10.postinst
index 30336ce..9671d9a 100755
--- a/qt/control/qpf-cyberbit-120-50-t10.postinst
+++ b/qt/control/qpf-cyberbit-120-50-t10.postinst
@@ -1,9 +1,11 @@
 #!/bin/sh
 
 set -e
 
 if [ "$1" != "configure" ]; then
     exit 0
 fi
 
+. /etc/profile
+
 update-qtfontdir
diff --git a/qt/control/qpf-fixed.postinst b/qt/control/qpf-fixed.postinst
index 30336ce..9671d9a 100755
--- a/qt/control/qpf-fixed.postinst
+++ b/qt/control/qpf-fixed.postinst
@@ -1,9 +1,11 @@
 #!/bin/sh
 
 set -e
 
 if [ "$1" != "configure" ]; then
     exit 0
 fi
 
+. /etc/profile
+
 update-qtfontdir
diff --git a/qt/control/qpf-helvetica.postinst b/qt/control/qpf-helvetica.postinst
index 30336ce..9671d9a 100755
--- a/qt/control/qpf-helvetica.postinst
+++ b/qt/control/qpf-helvetica.postinst
@@ -1,9 +1,11 @@
 #!/bin/sh
 
 set -e
 
 if [ "$1" != "configure" ]; then
     exit 0
 fi
 
+. /etc/profile
+
 update-qtfontdir
diff --git a/qt/control/qpf-micro.postinst b/qt/control/qpf-micro.postinst
index 30336ce..9671d9a 100755
--- a/qt/control/qpf-micro.postinst
+++ b/qt/control/qpf-micro.postinst
@@ -1,9 +1,11 @@
 #!/bin/sh
 
 set -e
 
 if [ "$1" != "configure" ]; then
     exit 0
 fi
 
+. /etc/profile
+
 update-qtfontdir
diff --git a/qt/control/qpf-smallsmooth.postinst b/qt/control/qpf-smallsmooth.postinst
index 30336ce..9671d9a 100755
--- a/qt/control/qpf-smallsmooth.postinst
+++ b/qt/control/qpf-smallsmooth.postinst
@@ -1,9 +1,11 @@
 #!/bin/sh
 
 set -e
 
 if [ "$1" != "configure" ]; then
     exit 0
 fi
 
+. /etc/profile
+
 update-qtfontdir
diff --git a/qt/control/qpf-smoothtimes.postinst b/qt/control/qpf-smoothtimes.postinst
index 30336ce..9671d9a 100755
--- a/qt/control/qpf-smoothtimes.postinst
+++ b/qt/control/qpf-smoothtimes.postinst
@@ -1,9 +1,11 @@
 #!/bin/sh
 
 set -e
 
 if [ "$1" != "configure" ]; then
     exit 0
 fi
 
+. /etc/profile
+
 update-qtfontdir
diff --git a/qt/qte234-for-opie091-fontdir.patch b/qt/qte234-for-opie091-fontdir.patch
index a765d44..3b3daf4 100644
--- a/qt/qte234-for-opie091-fontdir.patch
+++ b/qt/qte234-for-opie091-fontdir.patch
@@ -16,49 +16,49 @@
 +
 +getVar()
 +{
 +    eval "echo \$$1"
 +}
 +
 +handleQPF()
 +{
 +    base=`basename $1`
 +    family=`echo $base|cut -d_ -f1`
 +    pt=`echo $base|cut -d_ -f2`
 +    weight=`echo $base|cut -d_ -f3|sed -e 's,i$,,'`
 +    if (echo $base|cut -d_ -f3|grep -q 'i$'); then
 +        italic="y"
 +    else
 +        italic="n"
 +    fi
 +    echo "$family $base.qpf QPF $italic $weight $pt u"
 +}
 +
 +if [ -z "$1" ]; then
 +    if [ -n "$QTDIR" ]; then
 +        fontdir=$QTDIR/lib/fonts
 +    else
-+        usage
++        fontdir=/opt/QtPalmtop/lib/fonts
 +    fi
 +else
 +    fontdir=$1
 +fi
 +    
 +if ! [ -d $fontdir ]; then
 +    echo Error: $fontdir not a directory
 +    exit 1
 +fi
 +
 +if [ -e $fontdir/fontdir ]; then
 +    cat $fontdir/fontdir | grep -v '\.qpf' > $fontdir/fontdir.new
 +fi
 +
 +(
 +    for file in `ls $fontdir/*.qpf|sed -e's,\.qpf$,,; s,_t[^_]*$,,;'|sort -u`; do
 +        handleQPF $file
 +    done
 +) >> $fontdir/fontdir.new
 +
 +mv $fontdir/fontdir.new $fontdir/fontdir
 +
 +exit 0
 +