summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Sokolovsky <pmiscml@gmail.com>2007-07-04 21:04:10 +0000
committerPaul Sokolovsky <pmiscml@gmail.com>2007-07-04 21:04:10 +0000
commit53fef27026ea5bd64754b29d5b0be83786c0d509 (patch)
treee1d6e18765f371121ab73500cf404aa64e0234e8
parentfd08bcdc643e68f4463cec20b9653ebb831a5b9d (diff)
opie-init: Remove hacky and stale overrides for opie init script.
* This shouldn't be done this way. There shouldn't be need for doing device-specific (don't mix with feature-specific) configuration, and even if, it should be done if one well-maintained script.
-rwxr-xr-xpackages/opie-init/opie-init/c7x0/opie85
-rwxr-xr-xpackages/opie-init/opie-init/mnci/opie79
-rwxr-xr-xpackages/opie-init/opie-init/opie6
3 files changed, 6 insertions, 164 deletions
diff --git a/packages/opie-init/opie-init/c7x0/opie b/packages/opie-init/opie-init/c7x0/opie
deleted file mode 100755
index 84f3b3e673..0000000000
--- a/packages/opie-init/opie-init/c7x0/opie
+++ /dev/null
@@ -1,85 +0,0 @@
-#!/bin/sh
-#
-[ -z $LOGNAME ] && export LOGNAME=root && export HOME=/home/root
-[ -z $HOME ] && export HOME=/home/$LOGNAME
-
-# we need to tinker directly with qws_display until the ODevice
-# default (which is now W100:Rot0:0) works flawlessly with rotation
-# and survives a suspend/resume cycle
-export QWS_DISPLAY=Transformed:Rot0:0
-# export QWS_DISPLAY=W100:Rot0:0
-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
-
-if [ ! -x "$OPIEDIR/bin/qpe" ] ; then
- echo Opie not installed
- exit 0
-fi
-
-. /etc/profile
-
-for conf in $OPIEDIR/etc/skel/*.conf; do
- conf_basename=`basename $conf`
- if [ ! -e "$HOME/Settings/$conf_basename" ] ; then
- echo "Copying default $conf_basename into $HOME/Settings/"
- mkdir -p $HOME/Settings/
- cat $conf >$HOME/Settings/$conf_basename
- fi
-done
-
-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
-
-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 2>/dev/null
- killall opie-login 2>/dev/null
- killall quicklauncher 2>/dev/null
-
- ;;
-
-'restart')
- $0 stop && $0 start
-
- ;;
-
-*)
- echo "usage: $0 { start | stop | restart }"
-
- ;;
-
-esac
-
diff --git a/packages/opie-init/opie-init/mnci/opie b/packages/opie-init/opie-init/mnci/opie
deleted file mode 100755
index d5e2955b10..0000000000
--- a/packages/opie-init/opie-init/mnci/opie
+++ /dev/null
@@ -1,79 +0,0 @@
-#!/bin/sh
-#
-[ -z $LOGNAME ] && export LOGNAME=root && export HOME=/home/root
-[ -z $HOME ] && export HOME=/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
-# export QWS_KEYBOARD=KernelTTY
-
-if [ ! -x "$OPIEDIR/bin/qpe" ] ; then
- echo Opie not installed
- exit 0
-fi
-
-. /etc/profile
-
-if [ ! -e "$HOME/Settings/qpe.conf" ] ; then
- mkdir -p $HOME/Settings
- cp $OPIEDIR/etc/skel/* $HOME/Settings
-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
-
-case $1 in
-'start')
- if [ -x "$OPIEDIR/bin/opie-login" ]; then
- echo Starting Opie-login....
- $OPIEDIR/bin/opie-login -terminal 2
- else
- $OPIEDIR/bin/opie-reorgfiles >/dev/null
- 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 2>/dev/null
- fi
-
- ;;
-
-'stop')
- echo "Stopping Opie..."
- killall qpe 2>/dev/null
- killall opie-login 2>/dev/null
- killall quicklauncher 2>/dev/null
- sleep 1
- killall -9 qpe 2>/dev/null
- killall -9 opie-login 2>/dev/null
- killall -9 quicklauncher 2>/dev/null
-
- ;;
-
-'restart')
- $0 stop && $0 start
-
- ;;
-
-*)
- echo "usage: $0 { start | stop | restart }"
-
- ;;
-
-esac
-
diff --git a/packages/opie-init/opie-init/opie b/packages/opie-init/opie-init/opie
index 4a90854507..56c54e0a43 100755
--- a/packages/opie-init/opie-init/opie
+++ b/packages/opie-init/opie-init/opie
@@ -8,6 +8,12 @@ export OPIEDIR="$QTDIR"
export QPEDIR="$QTDIR"
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$OPIEDIR/lib
export PATH=$PATH:$OPIEDIR/bin
+# Following is from c7x0 override, check for validity, etc.
+## we need to tinker directly with qws_display until the ODevice
+## default (which is now W100:Rot0:0) works flawlessly with rotation
+## and survives a suspend/resume cycle
+#export QWS_DISPLAY=Transformed:Rot0:0
+## export QWS_DISPLAY=W100:Rot0:0
if [ -z `which qpe` ] ; then
echo Opie not installed