1 files changed, 92 insertions, 56 deletions

diff --git a/noncore/unsupported/oipkg/pmipkg.cpp b/noncore/unsupported/oipkg/pmipkg.cpp
index 528365e..681f2d4 100644
--- a/noncore/unsupported/oipkg/pmipkg.cpp
+++ b/noncore/unsupported/oipkg/pmipkg.cpp
@@ -26,10 +26,10 @@
 PmIpkg::PmIpkg( PackageManagerSettings* s, QWidget* p,  const char * name, WFlags f )
-  : RunWindow ( p, name, f )
-          //: QObject ( p )
+//  : RunWindow ( p, name, f )
+          : QObject ( p )
 {
   settings = s;
-  
+  runwindow = new RunWindow ( p, name, f );
   linkDest = new QCopChannel( "QPE/MakeLinks", this );
   connect( linkDest, SIGNAL(received(const QCString &, const QByteArray &)),
-           this, SLOT(linkDestination( const QString &, const  QString&)) );
+           this, SLOT(linkDestination( const QString &, const  QByteArray&)) );
 }
@@ -40,6 +40,13 @@ PmIpkg::~PmIpkg()
 
+//#define PROC
+#define SYSTEM
 int PmIpkg::runIpkg(const QString& args)
 {
-  pvDebug(4,"PmIpkg::runIpkg");
+  pvDebug(2,"PmIpkg::runIpkg "+args);
+#ifdef PROC
+  QStringList cmd = "/usr/bin/ipkg ";
+#endif
+#ifdef SYSTEM
   QString cmd = "/usr/bin/ipkg ";
+#endif
   cmd += " -dest "+settings->getDestinationName();
@@ -47,11 +54,21 @@ int PmIpkg::runIpkg(const QString& args)
   
-  outPut->setText( outPut->text()+"<br><br>Starting to "+ args+"<br>\n");
-  QString redirect = "/tmp/ipkg.pipe";
-  cmd += args+" | tee "+redirect+" 2>&1&";
-
-  outPut->setText( outPut->text() + "running:<br>\n"+cmd+"<br>\n" );
-  pvDebug( 0, "Execute >"+cmd+"<" );
-  int r = system(cmd.latin1());
+  out( "Starting to "+ args+"<br>\n");
+  cmd += args;
+  out( "running:<br>\n"+cmd+"<br>\n" );
+  int r = 0;
+#ifdef PROC
+        QString o = "start";
+  Process ipkg( cmd );
+  QString description;
+  ipkg.exec("",o);
+  out( o );
+#endif
+#ifdef SYSTEM
+  QString redirect = "/tmp/oipkg.pipe";
+  cmd += " | tee "+redirect+" 2>&1";
+        r = system(cmd.latin1());
   QFile f( redirect );
-  if (  f.open(IO_ReadOnly) ) {
+  while ( ! f.open(IO_ReadOnly) ) {};
+ // if ( f.open(IO_ReadOnly) ) {};
+  {
     QTextStream t( &f );
@@ -60,3 +77,3 @@ int PmIpkg::runIpkg(const QString& args)
       {
-        outPut->setText( outPut->text() + t.readLine() +"\n<br>" );
+                                out( t.readLine() +"<br>" );
       }
@@ -64,12 +81,4 @@ int PmIpkg::runIpkg(const QString& args)
   f.close();
-  outPut->setText( outPut->text() + "\n<br><br>Finished!");
-  outPut->setContentsPos(0,outPut->contentsHeight());
-
-  if ( r == 0 )
-    {
-      QString param = args.left( args.find(" ") );
-      QString file = args.right( args.length() - args.find(" ") );
-      if ( param == "install" && settings->createLinks() )
-        makeLinks( file);
-    }
+  out( "Finished!<br>");
+#endif
 
@@ -80,7 +89,8 @@ void PmIpkg::makeLinks(QString file)
 {
-  outPut->setText( outPut->text() + "<br>creating links<br>" );
+  out( "<br>creating links<br>" );
   QString dest = settings->getDestinationUrl();
-  system(("ipkg -d "+dest+" files "+file+"> /tmp/oipkg.pipe").latin1());
+  out("for package "+file+" in "+dest+"<br>");
+  system(("ipkg -d "+dest+" files "+file+"> /tmp/oipkg.pipe 2>&1").latin1());
   QFile f( "/tmp/oipkg.pipe" );
-  if ( ! f.open(IO_ReadOnly) )return;
+  while ( ! f.open(IO_ReadOnly) ) {};
   QTextStream t( &f );
@@ -89,3 +99,4 @@ void PmIpkg::makeLinks(QString file)
     {
-      processLinkDir( t.readLine(), dest );
+      fp = t.readLine();
+      processLinkDir( fp, dest );
             }
@@ -98,9 +109,2 @@ void PmIpkg::processLinkDir( QString file, QString dest )
   QFileInfo fileInfo( file );
-  if ( fileInfo.isFile() )
-    {
-      const char *instFile = strdup( (file).ascii() );
-      const char *linkFile = strdup(  (destFile).ascii());
-      outPut->setText( outPut->text() + "linking: "+file+" -> "+destFile  );
-      symlink( instFile, linkFile );
-    }
   if ( fileInfo.isDir() )
@@ -111,3 +115,2 @@ void PmIpkg::processLinkDir( QString file, QString dest )
       d.setFilter( QDir::Files | QDir::Hidden | QDir::NoSymLinks );
-
       const QFileInfoList *list = d.entryInfoList();
@@ -115,3 +118,5 @@ void PmIpkg::processLinkDir( QString file, QString dest )
       QFileInfo *fi;
-      while ( (fi=it.current()) ) {
+    while ( (fi=it.current()) )
+    {
+      out( "<b>"+fi->absFilePath()+"</b>" );
                 processLinkDir( fi->absFilePath(), dest );                      
@@ -119,2 +124,10 @@ void PmIpkg::processLinkDir( QString file, QString dest )
       }
+  } else
+  if ( fileInfo.isFile() )
+  {
+    const char *instFile = strdup( (file).ascii() );
+    const char *linkFile = strdup(  (destFile).ascii());
+    out( "linking: "+file+" -> "+destFile  );
+    qDebug( "linking: %s -> %s", instFile, linkFile );
+    symlink( instFile, linkFile );
     }
@@ -124,9 +137,10 @@ void PmIpkg::commit( PackageList pl )
         {   
-  showMaximized();
-  exec();
-  outPut->setText( "<b>Starting...</b><br>\n");
+  runwindow->showMaximized();
+//  exec();
+  runwindow->outPut->setText("");
+  out( "<h1>Starting...</h1><br>\n");
           QStringList to_remove, to_install;   
 
-  QString rem="To remove:<br>\n";
-  QString inst="To install:<br>\n";;
+  QString rem="<b>To remove:</b><br>\n";
+  QString inst="<b>To install:</b><br>\n";;
   for( Package *pack = pl.first();pack ; (pack = pl.next())  )
@@ -138,3 +152,3 @@ void PmIpkg::commit( PackageList pl )
               to_install.append( pack->name() );
-              inst += pack->name()+"\n";
+              inst += pack->name()+"<br>";
             }
@@ -143,3 +157,3 @@ void PmIpkg::commit( PackageList pl )
               to_remove.append( pack->name() );
-              rem += pack->name()+"\n";
+              rem += pack->name()+"<br>";
             }
@@ -148,3 +162,3 @@ void PmIpkg::commit( PackageList pl )
 
-  outPut->setText( outPut->text()+inst+rem);
+  out("<p>"+inst+"</p>"+"<p>"+rem+"</p>");
   bool ok=TRUE;
@@ -161,3 +175,11 @@ void PmIpkg::commit( PackageList pl )
     for (QStringList::ConstIterator it=to_install.begin(); it!=to_install.end(); ++it)
-      if ( runIpkg("install " + *it) != 0 ) ok = false;
+    {
+      if ( runIpkg("install " + *it) == 0 )
+                          {    
+                    if ( settings->createLinks() )
+                                        makeLinks( *it );
+                }else{
+              ok = false;
+      }
+    }
         
@@ -170,14 +192,28 @@ void PmIpkg::commit( PackageList pl )
 
-void PmIpkg::linkDestination( QString src, QString dest )
+void PmIpkg::linkDestination( const QString msg, const QByteArray dest )
+// add 3rd package parameter
 {
-  QDir d( src );
-  d.setFilter( QDir::Files | QDir::Hidden | QDir::NoSymLinks );
-  if (! d.exists() ) return;
-  const QFileInfoList *list = d.entryInfoList();
-  QFileInfoListIterator it( *list );
-  QFileInfo *fi;
-  while ( (fi=it.current()) ) {
-            processLinkDir( fi->absFilePath(), dest );                  
-    ++it;
+                qDebug("msg="+msg+" -- "+QString(dest) );
+//  QDir d( src );
+//  d.setFilter( QDir::Files | QDir::Hidden | QDir::NoSymLinks );
+////  if (! d.exists() ) return;
+//  const QFileInfoList *list = d.entryInfoList();
+//  QFileInfoListIterator it( *list );
+//  QFileInfo *fi;
+//  while ( (fi=it.current()) ) {
+        //    processLinkDir( fi->absFilePath(), dest );                
+//    ++it;
+//  }
+}
+
+void PmIpkg::update()
+{
+  runwindow->showMaximized();
+        runIpkg( "update" );
   }
+
+void PmIpkg::out( QString o )
+{
+        runwindow->outPut->setText( runwindow->outPut->text()+o );
+  runwindow->outPut->setContentsPos(0,runwindow->outPut->contentsHeight());
 }