diff options
| author | Holger Freyther <zecke@selfish.org> | 2004-10-14 19:45:59 +0000 |
|---|---|---|
| committer | Holger Freyther <zecke@selfish.org> | 2004-10-14 19:45:59 +0000 |
| commit | 6fc03c78b1508ff621be4894ae8ed4237d7e1ab3 (patch) | |
| tree | 671b0aa2b29a8238bd467cea9bb4d3430fb8a8c9 /opie-taskbar | |
| parent | 20e27493c4712f22c8c08153eaf243a8eef8300d (diff) | |
Merge bk://openembedded@openembedded.bkbits.net/packages
into handhelds.org:/home/ich/programming/oe/oe-packages-exported
2004/10/14 21:45:11+02:00 handhelds.org!zecke
Opie Networksettings CVS:
-Install changedns
2004/10/14 18:04:31+02:00 handhelds.org!zecke
Merge bk://openembedded@openembedded.bkbits.net/packages
into handhelds.org:/home/ich/programming/oe/oe-packages-exported
2004/10/14 17:35:36+02:00 handhelds.org!zecke
Opie-Taskbar CVS:
-Install locale.conf into the package if it is not empty
-On Opie start install locale.conf
BKrev: 416ed777c7dv8nQtYk7oyzu6ZkDQJA
Diffstat (limited to 'opie-taskbar')
| -rw-r--r-- | opie-taskbar/opie-taskbar/beagle/locale.conf | 0 | ||||
| -rw-r--r-- | opie-taskbar/opie-taskbar/locale.conf | 0 | ||||
| -rw-r--r-- | opie-taskbar/opie-taskbar/opie | 4 | ||||
| -rw-r--r-- | opie-taskbar/opie-taskbar_cvs.oe | 6 |
4 files changed, 9 insertions, 1 deletions
diff --git a/opie-taskbar/opie-taskbar/beagle/locale.conf b/opie-taskbar/opie-taskbar/beagle/locale.conf new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/opie-taskbar/opie-taskbar/beagle/locale.conf diff --git a/opie-taskbar/opie-taskbar/locale.conf b/opie-taskbar/opie-taskbar/locale.conf new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/opie-taskbar/opie-taskbar/locale.conf diff --git a/opie-taskbar/opie-taskbar/opie b/opie-taskbar/opie-taskbar/opie index 91bdff1901..e12ec6bf15 100644 --- a/opie-taskbar/opie-taskbar/opie +++ b/opie-taskbar/opie-taskbar/opie @@ -43,6 +43,10 @@ if [ ! -e "$HOME/Settings/qpe.conf" ] ; then cat $OPIEDIR/etc/skel/qpe.conf >$HOME/Settings/qpe.conf fi +if [ ! -e "$HOME/Settings/locale.conf" -a -e "$OPIEDIR/etc/skel/locale.conf" ] ; then + cat $OPIEDIR/etc/skel/locale.conf >$HOME/Settings/locale.conf +fi + case $1 in 'start') /sbin/getkey 5 "Starting Opie in 5 seconds... press key to interrupt." && exit 0 diff --git a/opie-taskbar/opie-taskbar_cvs.oe b/opie-taskbar/opie-taskbar_cvs.oe index e43388faee..876a9ef91c 100644 --- a/opie-taskbar/opie-taskbar_cvs.oe +++ b/opie-taskbar/opie-taskbar_cvs.oe @@ -18,7 +18,8 @@ SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/core/apps/cal file://server.pro \ file://opie-reorgfiles \ file://opie \ - file://qpe.conf" + file://qpe.conf \ + file://locale.conf " S = "${WORKDIR}/launcher" @@ -91,6 +92,9 @@ do_install() { install -m 0755 ${WORKDIR}/opie ${D}/etc/init.d/opie install -m 0644 ${WORKDIR}/qpe.conf ${D}/${palmtopdir}/etc/skel/ + if [ -s ${WORKDIR}/locale.conf ]; then + install -m 0644 ${WORKDIR}/locale.conf ${D}/${palmtopdir}/etc/skel/ + fi } # These two should be installed only on devices with keyboard |