added support for scipt ipkg (again;)

1 files changed, 65 insertions, 10 deletions

diff --git a/noncore/unsupported/oipkg/pmipkg.cpp b/noncore/unsupported/oipkg/pmipkg.cpp
index b23b9ea..eae73ad 100644
--- a/noncore/unsupported/oipkg/pmipkg.cpp
+++ b/noncore/unsupported/oipkg/pmipkg.cpp
@@ -45,2 +45,10 @@ int PmIpkg::runIpkg(const QString& args)
   pvDebug(2,"PmIpkg::runIpkg "+args);
+
+  //to make script ipkg happy
+  pvDebug(2, "cd "+settings->getDestinationUrl()+"/tmp/ipkg");
+  if (!QDir::setCurrent(settings->getDestinationUrl()+"/tmp/ipkg"))
+  {
+  	QDir instDir = QDir(settings->getDestinationUrl()+"/tmp/ipkg");
+   	instDir.mkdir(settings->getDestinationUrl()+"/tmp/ipkg");
+  }
 #ifdef PROC
@@ -155,2 +163,5 @@ void PmIpkg::commit( PackageList pl )
 
+  to_install.clear();
+  to_remove.clear();
+  int sizecount = 0;
   QString rem="<b>To remove:</b><br>\n";
@@ -163,3 +174,9 @@ void PmIpkg::commit( PackageList pl )
 	    {
+ #ifndef NEWLIST
 	      to_install.append( pack->name() );
+ #endif
+ #ifdef NEWLIST
+	      to_install.append( pack );
+       	sizecount += pack->size().toInt();
+ #endif
 	      inst += pack->name()+"<br>";
@@ -168,3 +185,9 @@ void PmIpkg::commit( PackageList pl )
 	    {
+ #ifndef NEWLIST
 	      to_remove.append( pack->name() );
+ #endif
+ #ifdef NEWLIST
+	      to_remove.append( pack );
+       	sizecount += 1;
+ #endif
 	      rem += pack->name()+"<br>";
@@ -178,2 +201,4 @@ void PmIpkg::commit( PackageList pl )
 
+  runwindow->progress->setTotalSteps( sizecount );
+
   connect( runwindow->doItButton, SIGNAL( clicked() ),
@@ -209,4 +234,6 @@ void PmIpkg::remove()
 	out("<hr><hr><b>"+tr("Removing")+"<br>"+tr("please wait")+"</b><br>");
-    for (QStringList::ConstIterator it=to_remove.begin(); it!=to_remove.end(); ++it)
-    {
+
+ #ifndef NEWLIST
+   for (QStringList::ConstIterator it=to_remove.begin(); it!=to_remove.end(); ++it)
+   {
       if ( runIpkg("remove " + *it) == 0)
@@ -218,2 +245,16 @@ void PmIpkg::remove()
     }
+#endif
+ #ifdef NEWLIST
+   for (Package *it=to_remove.first(); it != 0; it=to_remove.next() )
+   {
+      if ( runIpkg("remove " + it->name()) == 0)
+      {
+      	runwindow->progress->setProgress( it->size().toInt() + runwindow->progress->progress());
+        it->processed();
+        runwindow->progress->setProgress( 1 );
+  		}else{
+      	out("<b>"+tr("Error while removing")+"</b>"+it->name());
+      }
+    }
+#endif
 }
@@ -225,4 +266,4 @@ void PmIpkg::install()
 	show( true );
-	out("<hr><hr><b>"+tr("Installing")+"<br>"+tr("please wait")+"<b><br>");
-  if ( to_install.count() )
+	out("<hr><hr><b>"+tr("Installing")+"<br>"+tr("please wait")+"</b><br>");
+ #ifndef NEWLIST
     for (QStringList::ConstIterator it=to_install.begin(); it!=to_install.end(); ++it)
@@ -230,3 +271,3 @@ void PmIpkg::install()
       if ( runIpkg("install " + *it) == 0 )
-		  {    	
+		  {
 	    	if ( settings->createLinks() )
@@ -237,3 +278,17 @@ void PmIpkg::install()
     }
-	
+#endif
+ #ifdef NEWLIST
+ 	  for (Package *it=to_install.first(); it != 0; it=to_install.next() )
+    {
+      if ( runIpkg("install " + it->name()) == 0 )
+		  {    	
+      	runwindow->progress->setProgress( it->size().toInt() + runwindow->progress->progress());
+	    	if ( settings->createLinks() )
+					makeLinks( it->name() );
+     		it->processed();
+  		}else{
+      	out("<b>"+tr("Error while installing")+"</b>"+it->name());
+      }
+    }
+#endif
 }
@@ -292,6 +347,6 @@ void PmIpkg::show(bool b)
 	showButtons(b);
-	if ( b )
- 		runwindow->progress->show();
-  else
- 		runwindow->progress->show();
+//	if ( b )
+ 		runwindow->progress->hide();
+//  else
+// 		runwindow->progress->show();
 }