diff options
| author | Michael Lauer <mickey@vanille-media.de> | 2004-08-14 10:31:23 +0000 |
|---|---|---|
| committer | Michael Lauer <mickey@vanille-media.de> | 2004-08-14 10:31:23 +0000 |
| commit | fab001926a9004696a48b68565fd9758766f4045 (patch) | |
| tree | 38452917713d7a8c8b9475334a7ba071fa6df291 | |
| parent | b74b0f70835df26881fbe4bafbef45c13618c7b5 (diff) | |
opie-taskbar: don't touch $HOME during postinst. install default files into /etc/skel and then copy later
BKrev: 411de9fbYMd0n_F_YdR-wKvKRZzCoA
| -rw-r--r-- | opie-taskbar/opie-taskbar/opie | 5 | ||||
| -rw-r--r-- | opie-taskbar/opie-taskbar_cvs.oe | 13 |
2 files changed, 9 insertions, 9 deletions
diff --git a/opie-taskbar/opie-taskbar/opie b/opie-taskbar/opie-taskbar/opie index 268f0e7789..1197d815c4 100644 --- a/opie-taskbar/opie-taskbar/opie +++ b/opie-taskbar/opie-taskbar/opie @@ -32,6 +32,11 @@ fi . /etc/profile +if [ ! -x "$HOME/Settings/qpe.conf" ] ; then + echo "Copying default qpe.conf into $HOME/Settings/" + cp -f $OPIEDIR/etc/skel/qpe.conf $HOME/Settings/qpe.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 279e231dc1..84a63c5880 100644 --- a/opie-taskbar/opie-taskbar_cvs.oe +++ b/opie-taskbar/opie-taskbar_cvs.oe @@ -2,10 +2,11 @@ DESCRIPTION = "Opie Launcher" SECTION = "opie/base" PRIORITY = "optional" LICENSE = "GPL" +MAINTAINER = "Team Opie <opie@handhelds.org>" DEPENDS = "opie-libqrsync " PV = "1.1.5-cvs-${CVSDATE}" APPNAME = "qpe" -PR = "r9" +PR = "r10" SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/core/apps/calibrate \ cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/noncore/settings/mediummount \ @@ -58,7 +59,7 @@ do_install() { install -d ${D}/${palmtopdir}/pics/logo install -d ${D}/etc/init.d install -d ${D}/${palmtopdir}/etc/colors - install -d ${D}/${palmtopdir}/etc/skeleton + install -d ${D}/${palmtopdir}/etc/skel install -m 0755 ${S}/qpe ${D}/${palmtopdir}/bin/qpe install -m 0755 ${WORKDIR}/opie-reorgfiles ${D}/${palmtopdir}/bin/ @@ -68,7 +69,7 @@ do_install() { install -m 0644 ${WORKDIR}/etc/colors/*.scheme ${D}/${palmtopdir}/etc/colors/ install -m 0644 ${WORKDIR}/etc/mime.types ${D}/etc/ install -m 0755 ${WORKDIR}/opie ${D}/etc/init.d/opie - install -m 0644 ${WORKDIR}/qpe.conf ${D}/${palmtopdir}/etc/skeleton/ + install -m 0644 ${WORKDIR}/qpe.conf ${D}/${palmtopdir}/etc/skel/ } @@ -98,10 +99,4 @@ do_install_append_tosa () { install -m 0644 ${WORKDIR}/pics/numlock.xpm ${D}/${palmtopdir}/pics/ } -pkg_postinst() { -#!/bin/sh -if [ -n "$D" ]; then exit 1; fi -[ -e "$HOME/Settings/qpe.conf" ] || cp -f /opt/QtPalmtop/etc/skeleton/qpe.conf /$HOME/Settings/qpe.conf -} - FILES_opie-taskbar_append = " /etc ${palmtopdir}/apps ${palmtopdir}/pics" |