1 files changed, 64 insertions, 85 deletions

diff --git a/noncore/unsupported/oipkg/pmipkg.cpp b/noncore/unsupported/oipkg/pmipkg.cpp
index 5996e63..75f93cf 100644
--- a/noncore/unsupported/oipkg/pmipkg.cpp
+++ b/noncore/unsupported/oipkg/pmipkg.cpp
@@ -9,2 +9,3 @@
 #include <qpe/stringutil.h>
+#include <qpe/qpeapplication.h>
 #include <qdir.h>
@@ -39,15 +40,7 @@ PmIpkg::~PmIpkg()
 
-//#define PROC
-#define SYSTEM
-#define QT_QPROCESS_DEBUG
-int PmIpkg::runIpkg(const QString& args, const QString& dest )
+bool PmIpkg::runIpkg(const QString& args, const QString& dest )
 {
-  pvDebug(2,"PmIpkg::runIpkg "+args);
+        bool ret=false;
   QDir::setCurrent("/tmp");
-#ifdef PROC
-  QString cmd;
-#endif
-#ifdef SYSTEM
   QString cmd = "/usr/bin/ipkg ";
-#endif
         pvDebug( 3,"PmIpkg::runIpkg got dest="+dest);
@@ -70,38 +63,34 @@ int PmIpkg::runIpkg(const QString& args, const QString& dest )
 
-  out( "<hr><br>Starting to "+ args+"<br>\n");
+  out( "Starting to "+ args+"\n");
   cmd += args;
-  int r = 0;
-#ifdef PROC
-        QString o = "start";
-  Process *ipkg = new Process(QStringList() << "ipkg" << cmd );
-  out( "running:<br>\n"+ipkg->arguments().join(" ")+"<br>\n" );
-  QString description;
-  r = ipkg->exec("",o);
-  out( o );
-#endif
-#ifdef SYSTEM
-  out( "running:<br>\n"+cmd+"<br>\n" );
-  QString redirect = "/tmp/oipkg.pipe";
-  cmd += " 2>&1 | tee "+redirect+" 2>&1";
-  pvDebug(2, "running >"+cmd+"<");
-  r = system(cmd.latin1());
-  QFile f( redirect );
-  QString line;
-  QString oldLine;
-  while ( ! f.open(IO_ReadOnly) ) {};
-    QTextStream t( &f );
-    while ( !t.eof() )
-    {
-      line = t.readLine();
-                        if ( line != oldLine )
-                 {
-              out( line +"<br>" );
-                                oldLine = line;
+  out( "running:\n"+cmd+"\n" );
+  pvDebug(2,"running:"+cmd);
+  qApp->processEvents();
+  FILE *fp;
+  char line[130];
+  QString lineStr, lineStrOld;
+  sleep(1);
+  cmd +=" 2>&1";
+  fp = popen(  (const char *) cmd, "r");
+  if ( !fp ) {
+     qDebug("Could not execute '" + cmd + "'! err=%d", fp);
+     pclose(fp);
+     out("\nError while executing "+ cmd+"\n\n");
+     return false;
+  } else {
+     while ( fgets( line, sizeof line, fp)) {
+        lineStr = line;
+        lineStr=lineStr.left(lineStr.length()-1);
+        //Configuring opie-oipkg...Done
+        if (lineStr.contains("Done"))
+          ret = true;
+        if (lineStr!=lineStrOld)
+                out(lineStr);
+        lineStrOld = lineStr;
             }
+     pclose(fp);
     }
-  f.close();
-  out( "Finished!<br>");
-#endif
-
-  return r;
+  //out( "Finished!");
+  pvDebug(2,QString(ret?"success\n":"failure\n"));
+  return ret;
 }
@@ -129,3 +118,3 @@ QStringList* PmIpkg::getList( QString packFileName, QString d )
            pvDebug(1," Panik!  Could not open");
-          out( "<b>Panik!</b> Could not open:<br>"+packFileName );
+          out( "Panik!\n Could not open:\n"+packFileName );
            return (QStringList*)0;
@@ -245,2 +234,3 @@ void PmIpkg::commit()
   installDialog->showMaximized();
+  installDialog->show();
   if ( installDialog->exec() ) doIt();
@@ -248,3 +238,4 @@ void PmIpkg::commit()
   runwindow->showMaximized();
-  out(tr("<b>All done.</b>"));
+  runwindow->show();
+  out(tr("\nAll done."));
 }
@@ -253,3 +244,4 @@ void PmIpkg::doIt()
 {
-        show( true );
+        runwindow->progress->setProgress(0);
+        show();
          remove();
@@ -263,3 +255,3 @@ void PmIpkg::remove()
 
-        out("<b>"+tr("Removing")+"<br>"+tr("please wait")+"</b><br><hr>");
+        out(tr("Removing")+"\n"+tr("please wait")+"\n\n");
 
@@ -269,3 +261,3 @@ void PmIpkg::remove()
                         if ( to_remove.at(i)->link() )fileList = getList( to_remove.at(i)->name(), to_remove.at(i)->dest() );     
-    if ( runIpkg("remove " + to_remove.at(i)->name(), to_remove.at(i)->dest() ) == 0)
+    if ( runIpkg("remove " + to_remove.at(i)->name(), to_remove.at(i)->dest() ))
     {
@@ -275,4 +267,4 @@ void PmIpkg::remove()
              {
-                                        out( "<br>removing links<br>" );
-                                out( "for package "+to_remove.at(i)->name()+" in "+to_remove.at(i)->dest()+"<br>" );
+                                        out( "\nremoving links\n" );
+                                out( "for package "+to_remove.at(i)->name()+" in "+to_remove.at(i)->dest()+"\n" );
                 processFileList( fileList, to_remove.at(i)->dest() );
@@ -281,5 +273,5 @@ void PmIpkg::remove()
                 to_remove.take( i );       
-      out("<br><hr>");
+      out("\n\n");
                 }else{
-             out("<b>"+tr("Error while removing")+"</b><hr>"+to_remove.at(i)->name());
+             out(tr("Error while removing")+to_remove.at(i)->name()+"\n");
     }
@@ -288,3 +280,3 @@ void PmIpkg::remove()
   to_remove.clear();
-  out("<br>");
+  out("\n");
 }
@@ -295,6 +287,6 @@ void PmIpkg::install()
          if ( to_install.count() == 0 ) return;
-                out("<b>"+tr("Installing")+"<br>"+tr("please wait")+"</b><br>"); 
+                out(tr("Installing")+"\n"+tr("please wait")+"\n"); 
   for (uint i=0; i < to_install.count(); i++)
   {
-          if ( runIpkg("install " + to_install.at(i)->installName(), to_install.at(i)->dest() ) == 0 )
+          if ( runIpkg("install " + to_install.at(i)->installName(), to_install.at(i)->dest() ))
                         {    
@@ -304,4 +296,4 @@ void PmIpkg::install()
       {
-                                out( "<br>creating links<br>" );
-                        out( "for package "+to_install.at(i)->name()+" in "+to_install.at(i)->dest()+"<br>" );
+                                out( "\ncreating links\n" );
+                        out( "for package "+to_install.at(i)->name()+" in "+to_install.at(i)->dest()+"\n" );
                                 makeLinks( to_install.at(i) );
@@ -310,8 +302,8 @@ void PmIpkg::install()
       to_install.take( i );
-      out("<br><hr>");
+      out("\n\n");
           }else{
-             out("<b>"+tr("Error while installing")+"</b><hr>"+to_install.at(i)->name());
+             out(tr("Error while installing")+to_install.at(i)->name()+"\n");
     }
    }
-   out("<br>");
+   out("\n");
    to_install.clear();
@@ -341,3 +333,3 @@ void PmIpkg::update()
 {
-        show( false );
+        show();
         runIpkg( "update" );
@@ -349,5 +341,3 @@ void PmIpkg::out( QString o )
                 runwindow->outPut->append(o);
-         //runwindow->outPut->setCursorPosition(0, runwindow->outPut->contentsHeight());
-        //runwindow->outPut->setText( runwindow->outPut->text()+o );
-  runwindow->outPut->setContentsPos(0, runwindow->outPut->contentsHeight());
+         runwindow->outPut->setCursorPosition(runwindow->outPut->numLines() + 1,0,FALSE);
 }
@@ -355,28 +345,17 @@ void PmIpkg::out( QString o )
 
-void PmIpkg::showButtons(bool b)
-{
-        if ( b )
-         {
-                runwindow->cancelButton->hide();
-                runwindow->doItButton->hide();
-          runwindow->removeButton->hide();
-          runwindow->installButton->hide();
-  }else{
-                runwindow->cancelButton->show();
-                runwindow->doItButton->show();
-          runwindow->removeButton->show();
-          runwindow->installButton->show();
 
-  }
-}
 
-void PmIpkg::show(bool b)
+void PmIpkg::show()
 {
         if (!runwindow->isVisible())
+         {
           runwindow->showMaximized();
-        showButtons(b);
-        if ( !b )
-                runwindow->progress->hide();
-  else
-                runwindow->progress->show();
+          runwindow->show();
+  }
+  runwindow->outPut->setText("");
+        //showButtons(b);
+        //if ( !b )
+        //      runwindow->progress->hide();
+//  else
+        //      runwindow->progress->show();
 }