this patch will add support for QD installing directly to opie device via sync. not functioning until QD 1.7.1 released. should compile for now

1 files changed, 12 insertions, 2 deletions

diff --git a/core/launcher/packageslave.cpp b/core/launcher/packageslave.cpp
index 0461432..abbc610 100644
--- a/core/launcher/packageslave.cpp
+++ b/core/launcher/packageslave.cpp
@@ -20,134 +20,144 @@
 
 #include "packageslave.h"
 
 /* OPIE */
 #include <opie2/odebug.h>
 #include <qtopia/qprocess.h>
 #ifdef Q_WS_QWS
 #include <qtopia/qcopenvelope_qws.h>
 #endif
 using namespace Opie::Core;
 
 /* QT */
 #ifdef Q_WS_QWS
 #include <qcopchannel_qws.h>
 #endif
 #include <qtextstream.h>
 
 /* STD */
 #include <stdlib.h>
 #include <sys/stat.h> // mkdir()
 #if defined(_OS_LINUX_) || defined(Q_OS_LINUX)
 #include <unistd.h>
 #include <sys/vfs.h>
 #include <mntent.h>
 #elif defined(Q_OS_MACX)
 #include <unistd.h>
 #endif
 
 
 PackageHandler::PackageHandler( QObject *parent, char* name )
     : QObject( parent, name ), packageChannel( 0 ), currentProcess( 0 ), mNoSpaceLeft( FALSE )
 {
     // setup qcop channel
 #ifndef QT_NO_COP
     packageChannel = new QCopChannel( "QPE/Package", this );
     connect( packageChannel, SIGNAL( received(const QCString&,const QByteArray&) ),
          this, SLOT( qcopMessage(const QCString&,const QByteArray&) ) );
 #endif
 }
 
 void PackageHandler::qcopMessage( const QCString &msg, const QByteArray &data )
 {
     QDataStream stream( data, IO_ReadOnly );
 
     if ( msg == "installPackage(QString)" ) {
         QString file;
         stream >> file;
         installPackage( file );
+    } else if ( msg == "installPackage(QString,QString)" ) {
+        QString file, dest;
+        stream >> file >> dest;
+        installPackage( file, dest );
     } else if ( msg == "removePackage(QString)" ) {
     QString file;
         stream >> file;
         removePackage( file );
     } else if ( msg == "addPackageFiles(QString,QString)" ) {
     QString location, listfile;
         stream >> location >> listfile;
         addPackageFiles( location, listfile);
     } else if ( msg == "addPackages(QString)" ) {
     QString location;
         stream >> location;
         addPackages( location );
     } else if ( msg == "cleanupPackageFiles(QString)" ) {
     QString listfile;
         stream >> listfile;
     cleanupPackageFiles( listfile );
     } else if ( msg == "cleanupPackages(QString)" ) {
     QString location;
         stream >> location;
         cleanupPackages( location );
     } else if ( msg == "prepareInstall(QString,QString)" ) {
     QString size, path;
     stream >> size;
     stream >> path;
     prepareInstall( size, path );
     }
 }
 
-void PackageHandler::installPackage( const QString &package )
+void PackageHandler::installPackage( const QString &package, const QString &dest )
 {
     if ( mNoSpaceLeft ) {
     mNoSpaceLeft = FALSE;
     // Don't emit that for now, I still couldn't test it (Wener)
     //sendReply( "installFailed(QString)", package );
     //return;
     }
 
-    currentProcess = new QProcess( QStringList() << "ipkg" << "install" << package ); // No tr
+    QStringList cmd;
+    cmd << "ipkg";
+    if ( !dest.isEmpty() ) {
+	cmd << "-d" << dest;
+    }
+    cmd << "install" << package;
+    currentProcess = new QProcess( cmd ); // No tr
     connect( currentProcess, SIGNAL( processExited() ), SLOT( iProcessExited() ) );
     connect( currentProcess, SIGNAL( readyReadStdout() ), SLOT( readyReadStdout() ) );
     connect( currentProcess, SIGNAL( readyReadStderr() ), SLOT( readyReadStderr() ) );
     currentPackage = package;
 
     currentProcessError="";
     sendReply( "installStarted(QString)", package );
     currentProcess->start();
 }
 
 void PackageHandler::removePackage( const QString &package )
 {
     currentProcess = new QProcess( QStringList() << "ipkg" << "remove" << package ); // No tr
     connect( currentProcess, SIGNAL( processExited() ), SLOT( rmProcessExited() ) );
     connect( currentProcess, SIGNAL( readyReadStdout() ), SLOT( readyReadStdout() ) );
     connect( currentProcess, SIGNAL( readyReadStderr() ), SLOT( readyReadStderr() ) );
     currentPackage = package;
 
     currentProcessError="";
     sendReply( "removeStarted(QString)", package );
     currentProcess->start();
 }
 
 void PackageHandler::sendReply( const QCString& msg, const QString& arg )
 {
 #ifndef QT_NO_COP
     QCopEnvelope e( "QPE/Desktop", msg );
     e << arg;
 #endif
 }
 
 void PackageHandler::addPackageFiles( const QString &location,
                       const QString &listfile )
 {
     QFile f(listfile);
 #ifndef Q_OS_WIN32
     //make a copy so we can remove the symlinks later
     mkdir( ("/usr/lib/ipkg/info/"+location).ascii(), 0777 );
     system(("cp " + f.name() + " /usr/lib/ipkg/info/"+location).ascii());
 #else
     QDir d;
     //#### revise
     odebug << "Copy file at " << __FILE__ << ": " << __LINE__ << "" << oendl;
     d.mkdir(("/usr/lib/ipkg/info/" + location).ascii());
     system(("copy " + f.name() + " /usr/lib/ipkg/info/"+location).ascii());
 #endif