Diffstat (limited to 'noncore/unsupported/oipkg/pmipkg.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/unsupported/oipkg/pmipkg.cpp | 75 |
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 @@ -22,48 +22,56 @@ #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) { 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 QStringList cmd = "/usr/bin/ipkg "; #endif #ifdef SYSTEM QString cmd = "/usr/bin/ipkg "; #endif cmd += " -dest "+settings->getDestinationName(); cmd += " -force-defaults "; out( "<hr><br>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"; pvDebug(2, "running >"+cmd+"<"); @@ -132,131 +140,178 @@ void PmIpkg::processLinkDir( QString file, QString dest ) QFileInfo *fi; while ( (fi=it.current()) ) { // out( "<b>"+fi->absFilePath()+"</b>" ); processLinkDir( fi->absFilePath(), dest ); ++it; } } 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 ); } } void PmIpkg::commit( PackageList pl ) { show( false ); runwindow->outPut->setText(""); out( "<h1>"+tr("Todo")+"</h1>\n"); + to_install.clear(); + to_remove.clear(); + int sizecount = 0; 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()) ) { if ( pack && (pack->name() != "") && pack) { if ( pack->toInstall() ) { + #ifndef NEWLIST to_install.append( pack->name() ); + #endif + #ifdef NEWLIST + to_install.append( pack ); + sizecount += pack->size().toInt(); + #endif inst += pack->name()+"<br>"; } if ( pack->toRemove() ) { + #ifndef NEWLIST to_remove.append( pack->name() ); + #endif + #ifdef NEWLIST + to_remove.append( pack ); + sizecount += 1; + #endif rem += pack->name()+"<br>"; } } } out("<p>"+inst+"</p>"+"<p>"+rem+"</p><hl>"); qDebug("to remove=%i; to install=%i",to_remove.count(),to_install.count()); + runwindow->progress->setTotalSteps( sizecount ); + connect( runwindow->doItButton, SIGNAL( clicked() ), SLOT( doIt() ) ); connect( runwindow->installButton, SIGNAL( clicked() ), this, SLOT( install() ) ); connect( runwindow->removeButton, SIGNAL( clicked() ), this, SLOT( remove() ) ); connect( runwindow->cancelButton, SIGNAL( clicked() ), runwindow, SLOT( close() ) ); runwindow->exec(); // ##### If we looked in the list of files, we could send out accurate // ##### messages. But we don't bother yet, and just do an "all". QCopEnvelope e("QPE/System", "linkChanged(QString)"); QString lf = QString::null; e << lf; return; } void PmIpkg::doIt() { remove(); install(); } void PmIpkg::remove() { if ( to_remove.count() == 0 ) return; show( true ); 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) { }else{ out("<b>"+tr("Error while removing")+"</b>"+*it); } } +#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 } void PmIpkg::install() { if ( to_install.count() == 0 ) return; 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) { if ( runIpkg("install " + *it) == 0 ) - { + { if ( settings->createLinks() ) makeLinks( *it ); }else{ out("<b>"+tr("Error while installing")+"</b>"+*it); } } - +#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 } void PmIpkg::linkDestination( const QString msg, const QByteArray dest ) // add 3rd package parameter { 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() { show( false ); runIpkg( "update" ); runwindow->close(); } @@ -269,29 +324,29 @@ 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) { if (!runwindow->isVisible()) runwindow->showMaximized(); showButtons(b); - if ( b ) - runwindow->progress->show(); - else - runwindow->progress->show(); +// if ( b ) + runwindow->progress->hide(); +// else +// runwindow->progress->show(); } |