1 files changed, 11 insertions, 10 deletions

diff --git a/noncore/unsupported/oipkg/pmipkg.cpp b/noncore/unsupported/oipkg/pmipkg.cpp
index 2559a51..be9d6da 100644
--- a/noncore/unsupported/oipkg/pmipkg.cpp
+++ b/noncore/unsupported/oipkg/pmipkg.cpp
@@ -9,92 +9,91 @@
 #include <qpe/stringutil.h>
 #include <qdir.h>
 #include <qfile.h>
 #include <qgroupbox.h>
 #include <qmultilineedit.h>
 #include <qstring.h>
 #include <qcheckbox.h>
 #include <qtextstream.h>
 #include <qtextview.h>
 
 #include <qprogressbar.h>
 #include <qpushbutton.h>
 #include <qlayout.h>
 
 #include <stdlib.h>
 #include <unistd.h>
 
 #include "mainwindow.h"
 
 
 PmIpkg::PmIpkg( PackageManagerSettings* s, QWidget* p,  const char * name, WFlags f )
   	: QObject ( p )
 {
   settings = s;
-  runwindowopen = false;
  	runwindow = new RunWindow( p, name, true, f );
 }
 
 PmIpkg::~PmIpkg()
 {
 }
 
 //#define PROC
 #define SYSTEM
 int PmIpkg::runIpkg(const QString& args, const QString& dest )
 {
   pvDebug(2,"PmIpkg::runIpkg "+args);
 
 #ifdef PROC
   QStringList cmd = "/usr/bin/ipkg ";
 #endif
 #ifdef SYSTEM
   QString cmd = "/usr/bin/ipkg ";
 #endif
 	pvDebug( 3,"PmIpkg::runIpkg got dest="+dest);
 	if ( dest == "" )
 	  cmd += " -dest "+settings->getDestinationName();
   else
 	  cmd += " -dest "+ dest;
 
  	cmd += " -force-defaults ";
 
   if (_force_depends)
   {
 	  if (_force_depends->isChecked())
   		 cmd += " -force-depends ";
 	  if (_force_reinstall->isChecked())
   		 cmd += " -force-reinstall ";
 	  if (_force_remove->isChecked())
   		 cmd += " -force-removal-of-essential-packages ";
   }
 
   out( "<hr><br>Starting to "+ args+"<br>\n");
   cmd += args;
   int r = 0;
 #ifdef PROC
 	QString o = "start";
-  Process *ipkg = new Process( "ls");//cmd );
+  Process *ipkg = new Process( cmd );
   out( "running:<br>\n"+ipkg->arguments().join(" ")+"<br>\n" );
   QString description;
   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;
     	}
@@ -139,122 +138,123 @@ QStringList* PmIpkg::getList( QString packFileName, QString d )
   return fileList;
 }
 
 void PmIpkg::linkPackage( QString packFileName, QString dest )
 {
 	QStringList *fileList = getList( packFileName, dest );
  	processFileList( fileList, dest );
   delete fileList;
 }
 
 void PmIpkg::processFileList( QStringList *fileList, QString d )
 {
 	if (!fileList) return;
   for (uint i=0; i < fileList->count(); i++)
     {
       QString dest = settings->getDestinationUrlByName( d );
 		 	dest = dest==""?d:dest;
       processLinkDir( (*fileList)[i], dest );
     }	
 }
 
 
 void PmIpkg::processLinkDir( QString file, QString dest )
 {
-	pvDebug( 7,"PmIpkg::processLinkDir "+file+" to "+ dest);
- 	if (linkOpp==createLink) pvDebug( 2,"opp: createLink");
- 	if (linkOpp==removeLink) pvDebug( 2,"opp:removeLink");
+	pvDebug( 4,"PmIpkg::processLinkDir "+file+" to "+ dest);
+ 	if (linkOpp==createLink) pvDebug( 4,"opp: createLink");
+ 	if (linkOpp==removeLink) pvDebug( 4,"opp: removeLink");
 	if ( dest == "???" || dest == "" ) return;
   QString destFile = file;
 	file = dest+"/"+file;
  	if (file == dest) return;
   QFileInfo fileInfo( file );
   if ( fileInfo.isDir() )
   {
+    pvDebug(4, "process dir "+file);
   	QDir destDir( destFile );
     if (linkOpp==createLink) destDir.mkdir( destFile, true );
     QDir d( file );
     d.setFilter( QDir::Files | QDir::Hidden | QDir::NoSymLinks );
     const QFileInfoList *list = d.entryInfoList();
     QFileInfoListIterator it( *list );
     QFileInfo *fi;
     while ( (fi=it.current()) )
     {
-	    pvDebug(4, "process dir "+fi->absFilePath());
   		processLinkDir( fi->absFilePath(), dest );      			
 			++it;
     }
 //    if (linkOpp==removeLink)
 //    {
 //    	pvDebug(2,"remove  destDir "+ destFile );
 //    	destDir.remove( destFile, true );
 //    }
   } else
   if ( fileInfo.isFile() )
   {
     const char *instFile = strdup( (file).ascii() );
     const char *linkFile = strdup(  (destFile).ascii());
     if( linkOpp==createLink )
 		{
     	pvDebug(4, "linking: "+file+" -> "+destFile );
     	symlink( instFile, linkFile );
   	}
   }  else  {
     const char *linkFile = strdup(  (destFile).ascii());
     if( linkOpp==removeLink )
     {
       pvDebug(4,"removing "+destFile+" no "+file);
       QFileInfo toRemoveLink( destFile );
     	if ( !QFile::exists( file ) && toRemoveLink.isSymLink() )
      		unlink( linkFile ); 	
     }
   }
 }
 
 void PmIpkg::loadList( PackageList pl )
 {   	
   for( Package *pack = pl.first();pack ; (pack = pl.next())  )
   {
   	if ( pack && (pack->name() != "") && pack)
 		{
 		  if ( pack->toInstall() )
 	      to_install.append( pack );
 		  if ( pack->toRemove() )
 	      to_remove.append( pack );
 		}
   }
 }
 
 void PmIpkg::commit( PackageList pl )
 {   	
-  sizecount = 0;
-  QString rem="<b>"+tr("To remove:")+"</b><br>\n";
-  QString inst="<b>"+tr("To install:")+"</b><br>\n";
+  int sizecount = 0;
+//  QString rem="<b>"+tr("To remove:")+"</b><br>\n";
+//  QString inst="<b>"+tr("To install:")+"</b><br>\n";
   loadList(pl);
   for (uint i=0; i < to_remove.count(); i++)
        	sizecount += 1;
   for (uint i=0; i < to_install.count(); i++)
        	sizecount += to_install.at(i)->size().toInt();
+  runwindow->progress->setTotalSteps(sizecount);
 	startDialog();
 }
 
 void PmIpkg::startDialog()
 {
   installDialog = new QDialog(0,0,true);
   QGridLayout *RunWindowLayout = new QGridLayout( installDialog );
   RunWindowLayout->setSpacing( 2 );
   RunWindowLayout->setMargin( 2 );
 
     PackageListView *plv = new PackageListView(installDialog, "install",settings);
     plv->setSizePolicy(QSizePolicy(QSizePolicy::Expanding,QSizePolicy::Expanding, plv->sizePolicy().mayShrinkVertically()) );
     RunWindowLayout->addWidget( plv, 1, 0 );
 		QCheckListItem *toRemoveItem;
 		toRemoveItem= new QCheckListItem( plv, QObject::tr("To remove") );
   	toRemoveItem->setOpen( true );
     for (Package *it=to_remove.first(); it != 0; it=to_remove.next() )
 	  {
       toRemoveItem->insertItem( new PackageListItem(plv, it,settings) );
    	} 	
 		QCheckListItem *toInstallItem;
 		toInstallItem = new QCheckListItem( plv, QObject::tr("To install") );
   	toInstallItem->setOpen( true );
     for (Package *it=to_install.first(); it != 0; it=to_install.next() )
@@ -300,77 +300,78 @@ void PmIpkg::doIt()
 }
 
 
 void PmIpkg::remove()
 {
  	if ( to_remove.count() == 0 ) return;
 
 	out("<b>"+tr("Removing")+"<br>"+tr("please wait")+"</b><br><hr>");
 
 	QStringList *fileList;
   for (Package *it=to_remove.first(); it != 0; it=to_remove.next() )
   {
 			if ( it->link() )fileList = getList( it->name(), it->dest() );     	
       if ( runIpkg("remove " + it->name(), it->dest() ) == 0)
       {
         runwindow->progress->setProgress( 1 + runwindow->progress->progress() );
        	linkOpp = removeLink;
 	    	if ( it->link() )
       	{
 					out( "<br>removing links<br>" );
   				out( "for package "+it->name()+" in "+it->dest()+"<br>" );
       		processFileList( fileList, it->dest() );
         }
      		it->processed();
-       	
+//       	to_install.take( it );       	
         out("<br><hr>");
   		}else{
       	out("<b>"+tr("Error while removing")+"</b><hr>"+it->name());
       }
 	  if ( it->link() )delete fileList;
     }
     out("<br>");
 }
 
 
 void PmIpkg::install()
 {
  	if ( to_install.count() == 0 ) return;
 	out("<b>"+tr("Installing")+"<br>"+tr("please wait")+"</b><br>");
  	for (Package *it=to_install.first(); it != 0; it=to_install.next() )
     {
 
       if ( runIpkg("install " + it->installName(), it->dest() ) == 0 )
 		  {    	
       	runwindow->progress->setProgress( it->size().toInt() + runwindow->progress->progress());
        	linkOpp = createLink;
 	    	if ( it->link() )
       	{
 					out( "<br>creating links<br>" );
   				out( "for package "+it->name()+" in "+it->dest()+"<br>" );
 					makeLinks( it );
      		}
      		it->processed();
+//       	to_install.take( it->name() );
         out("<br><hr>");
   		}else{
       	out("<b>"+tr("Error while installing")+"</b><hr>"+it->name());
       }
     }
     out("<br>");
 }
 
 void PmIpkg::createLinks( const QString &dest )
 {
 	pvDebug(2,"PmIpkg::createLinks "+dest);
 	linkOpp=createLink;
  	QString url = settings->getDestinationUrlByName( dest );
   url = url==""?dest:url;
 	processLinkDir( "/", url );
 }
 
 void PmIpkg::removeLinks( const QString &dest )
 {
 	pvDebug(2,"PmIpkg::removeLinks "+dest);
 	linkOpp=removeLink;
  	QString url = settings->getDestinationUrlByName( dest );
   url = url==""?dest:url;
 	processLinkDir( "/", url );