diff options
| author | Michael Lauer <mickey@vanille-media.de> | 2005-01-23 20:35:09 +0000 |
|---|---|---|
| committer | Michael Lauer <mickey@vanille-media.de> | 2005-01-23 20:35:09 +0000 |
| commit | 390498803b1b69ec1f874dd34577876c50d4d626 (patch) | |
| tree | 159902cd891bb5852b4c2ad426af2164276d6516 /packages/opie-taskbar | |
| parent | 1a7a204665870d81ec00e4d37fa9ee9a4596851c (diff) | |
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into r2d2.tm.informatik.uni-frankfurt.de:/local/pkg/oe/packages
2005/01/23 21:34:45+01:00 uni-frankfurt.de!mickeyl
remove setting QWS_DISPLAY in the init script. this is done in the launcher now. If you need to, then you can override it via console
BKrev: 41f40a7dzRcWTif4Vjd-4Sga63rMQg
Diffstat (limited to 'packages/opie-taskbar')
| -rw-r--r-- | packages/opie-taskbar/opie-taskbar/openzaurus-pxa-2.6/opie | 89 | ||||
| -rw-r--r-- | packages/opie-taskbar/opie-taskbar/opie | 24 |
2 files changed, 2 insertions, 111 deletions
diff --git a/packages/opie-taskbar/opie-taskbar/openzaurus-pxa-2.6/opie b/packages/opie-taskbar/opie-taskbar/openzaurus-pxa-2.6/opie deleted file mode 100644 index ed0426f3ca..0000000000 --- a/packages/opie-taskbar/opie-taskbar/openzaurus-pxa-2.6/opie +++ /dev/null @@ -1,89 +0,0 @@ -#!/bin/sh -# -[ -z $LOGNAME ] && export LOGNAME=root && export HOME=/root -[ -z $HOME ] && export HOME=/$LOGNAME - -export QTDIR=/opt/QtPalmtop -export OPIEDIR=/opt/QtPalmtop -export QPEDIR=/opt/QtPalmtop -export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$OPIEDIR/lib -export PATH=$PATH:$OPIEDIR/bin -# FIXME: add check for qt version here. the statement above applies to qt >=2.3.9 -# export QWS_KEYBOARD=KernelTTY - -export QWS_DISPLAY=Transformed:Rot0:0 - -if [ ! -x "$OPIEDIR/bin/qpe" ] ; then - echo Opie not installed - exit 0 -fi - -. /etc/profile - -if [ ! -e "$HOME/Settings/qpe.conf" ] ; then - echo "Copying default qpe.conf into $HOME/Settings/" - mkdir -p $HOME/Settings/ - 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 - -if [ ! -e "$HOME/systeminfo/linkver" ] ; then - mkdir -p $HOME/systeminfo/ - echo "1.13" >$HOME/systeminfo/linkver -fi - -if [ ! -e "/opt/Qtopia" ] ; then - ln -sf /opt/QtPalmtop /opt/Qtopia -fi - -if [ ! -e "/home/root" ] ; then - ln -sf /root /home -fi - -case $1 in -'start') - /sbin/getkey 5 "Starting Opie in 5 seconds... press key to interrupt." && exit 0 - - if [ -x "$OPIEDIR/bin/opie-login" ]; then - echo Starting Opie-login.... - $OPIEDIR/bin/opie-login -terminal 2 - else - $OPIEDIR/bin/opie-reorgfiles - if [ -x /usr/bin/ssh-agent ]; then - SSHAGENT=/usr/bin/ssh-agent - else - SSHAGENT="" - fi - - if [ -x "$OPIEDIR/bin/opie-sh-ssh-askpass.sh" ]; then - export SSH_ASKPASS=$OPIEDIR/bin/opie-sh-ssh-askpass.sh - fi - echo Starting Opie.... - $SSHAGENT $OPIEDIR/bin/qpe -terminal 2 - fi - - ;; - -'stop') - echo "Stopping Opie..." - killall qpe - killall opie-login - killall quicklauncher - - ;; - -'restart') - $0 stop && $0 start - - ;; - -*) - echo "usage: $0 { start | stop | restart }" - - ;; - -esac - diff --git a/packages/opie-taskbar/opie-taskbar/opie b/packages/opie-taskbar/opie-taskbar/opie index 7d0ab96485..95d13aabc7 100644 --- a/packages/opie-taskbar/opie-taskbar/opie +++ b/packages/opie-taskbar/opie-taskbar/opie @@ -8,28 +8,8 @@ export OPIEDIR=/opt/QtPalmtop export QPEDIR=/opt/QtPalmtop export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$OPIEDIR/lib export PATH=$PATH:$OPIEDIR/bin -# FIXME: add check for qt version here. the statement above applies to qt >=2.3.9 # export QWS_KEYBOARD=KernelTTY -if [ -e /proc/cpuinfo ] ; then - model=`grep "^Hardware" /proc/cpuinfo | sed -e "s/.*: *//" | tr a-z A-Z` - - case "$model" in - "HP IPAQ H3100" | "HP IPAQ H3800" ) - export QWS_DISPLAY=Transformed:Rot90:0 ;; - "HP IPAQ H5400" | "HP JORNADA 56X" | "HP IPAQ H2200" | "SHARP Tosa" ) - export QWS_DISPLAY=Transformed:Rot0:0 ;; - *SIMPAD* ) - export QWS_KEYBOARD='SIMpad' - export QWS_DISPLAY=Transformed:Rot0:0 ;; - - *) - export QWS_DISPLAY=Transformed:Rot270:0 ;; - esac -else - export QWS_DISPLAY=Transformed:Rot270:0 -fi - if [ ! -x "$OPIEDIR/bin/qpe" ] ; then echo Opie not installed exit 0 @@ -56,8 +36,8 @@ if [ ! -e "/opt/Qtopia" ] ; then ln -sf /opt/QtPalmtop /opt/Qtopia fi -if [ ! -e "/home/root" ] ; then - ln -sf /root /home +if [ ! -e "/home/root/" ] ; then + ln -sf /root /home/ fi case $1 in |