1. Implemented linking of apps to root (thanks to zecke for getting this started for me) 2. Bumped version to 0.5.0 (all v1.0 functionality is there...I think) 3. Added package dependency on ipkg-link 4. Updated Opie-PM ChangeLog, TODO

1 files changed, 70 insertions, 34 deletions

diff --git a/noncore/settings/packagemanager/installdlg.cpp b/noncore/settings/packagemanager/installdlg.cpp
index 781f8f5..494603b 100644
--- a/noncore/settings/packagemanager/installdlg.cpp
+++ b/noncore/settings/packagemanager/installdlg.cpp
@@ -51,5 +51,5 @@ _;:,   .>  :=|.         This file is free software; you can
 #include "opackagemanager.h"
 
-InstallDlg::InstallDlg( QWidget *parent, OPackageManager *pm, const QString &caption, bool showDestInfo,
+InstallDlg::InstallDlg( QWidget *parent, OPackageManager *pm, const QString &caption,
                         OPackage::Command command1, const QStringList &packages1,
                         OPackage::Command command2, const QStringList &packages2,
@@ -57,4 +57,5 @@ InstallDlg::InstallDlg( QWidget *parent, OPackageManager *pm, const QString &cap
     : QWidget( 0x0 )
     , m_packman( pm )
+    , m_installFound( false )
     , m_numCommands( 0 )
     , m_currCommand( 0 )
@@ -67,4 +68,7 @@ InstallDlg::InstallDlg( QWidget *parent, OPackageManager *pm, const QString &cap
         m_packages[ m_numCommands ] = packages1;
         ++m_numCommands;
+        
+        if ( command1 == OPackage::Install )
+            m_installFound = true;
     }
     if ( command2 != OPackage::NotDefined )
@@ -73,4 +77,7 @@ InstallDlg::InstallDlg( QWidget *parent, OPackageManager *pm, const QString &cap
         m_packages[ m_numCommands ] = packages2;
         ++m_numCommands;
+        
+        if ( command2 == OPackage::Install )
+            m_installFound = true;
     }
     if ( command3 != OPackage::NotDefined )
@@ -79,4 +86,7 @@ InstallDlg::InstallDlg( QWidget *parent, OPackageManager *pm, const QString &cap
         m_packages[ m_numCommands ] = packages3;
         ++m_numCommands;
+        
+        if ( command3 == OPackage::Install )
+            m_installFound = true;
     }
 
@@ -87,5 +97,5 @@ InstallDlg::InstallDlg( QWidget *parent, OPackageManager *pm, const QString &cap
     QGridLayout *layout = new QGridLayout( this, 4, 2, 2, 4 );
 
-    if ( showDestInfo )
+    if ( m_installFound )
     {
         QLabel *label = new QLabel( tr( "Destination" ), this );
@@ -221,5 +231,5 @@ void InstallDlg::slotBtnStart()
     // Start was clicked, start executing
     QString dest;
-    if ( m_destination )
+    if ( m_installFound )
     {
         dest = m_destination->currentText();
@@ -238,4 +248,5 @@ void InstallDlg::slotBtnStart()
     }
 
+    Opie::Core::OProcess process( this );
     for ( m_currCommand = 0; m_currCommand < m_numCommands; m_currCommand++ )
     {
@@ -243,40 +254,65 @@ void InstallDlg::slotBtnStart()
         m_packman->executeCommand( m_command[ m_currCommand ], m_packages[ m_currCommand ], dest,
                                    this, SLOT(slotOutput(char*)), true );
+                                   
+        // Link/Unlink application if the package was removed from or installed to a destination
+        // other than root
+        if ( ( m_command[ m_currCommand ] == OPackage::Install && dest != "root" ) ||
+             ( m_command[ m_currCommand ] == OPackage::Remove ) )
+        {
+            //m_packman->findPackage( m_packages[ m_currCommand ]->destination() != "root"*/ ) 
+            
+            // Loop through all package names in the command group
+            for ( QStringList::Iterator it = m_packages[ m_currCommand ].begin();
+                  it != m_packages[ m_currCommand ].end();
+                  ++it )
+            {
+                OPackage *currPackage = m_packman->findPackage( (*it) );
+                
+                // Skip package if it is not found or being removed from 'root'
+                if ( !currPackage || ( m_command[ m_currCommand ] == OPackage::Remove &&
+                                       currPackage->destination() == "root" ) )
+                    continue;
+                    
+                // Display feedback to user
+                if ( m_command[ m_currCommand ] == OPackage::Install )
+                    m_output->append( tr( QString( "Running ipkg-link to link package '%1'." )
+                                            .arg( currPackage->name() ) ) );
+                else
+                    m_output->append( tr( QString( "Running ipkg-link to remove links for package '%1'." )
+                                            .arg( currPackage->name() ) ) );
+                m_output->setCursorPosition( m_output->numLines(), 0 );
+                
+                // Execute ipkg-link
+                process.clearArguments();
+                process << "ipkg-link"
+                        << ( ( m_command[ m_currCommand ] == OPackage::Install ) ? "add" : "remove" )
+                        << currPackage->name();
+                if ( !process.start( Opie::Core::OProcess::Block,
+                                    Opie::Core::OProcess::NoCommunication ) )
+                {
+                    slotProcessDone( 0x0 );
+                    m_output->append( tr( "Unable to run ipkg-link." ) );
+                    m_output->setCursorPosition( m_output->numLines(), 0 );
+                    return;
+                }
+            }
+                           
+        }
     }
-    slotProcessDone(0l);
-
-    // Get destination
-/*
-    if ( dest == "root" )
-    {
-        slotProcessDone(0l);
-        return;
-    }
-
-    m_destItem = m_packman->findConfItem( OConfItem::Destination, dest );
-    if ( m_destItem )
-    {
-        QString path = m_destItem->value();
-        Opie::Core::OProcess *process = new Opie::Core::OProcess( this, "ipkg-link process" );
-        connect( process, SIGNAL(processExited(Opie::Core::OProcess*)),
-                 this, SLOT(slotProcessDone(Opie::Core::OProcess*)) );
-
-        *process << "ipkg-link" << "mount" << path;
-        if ( !process->start( Opie::Core::OProcess::NotifyOnExit,
-                              Opie::Core::OProcess::NoCommunication ) )
-            slotProcessDone( 0l );
-        m_output->append( tr( "Starting ipkg-link to link installed applications." ) );
-        m_output->setCursorPosition( m_output->numLines(), 0 );
-    }
-*/
+    
+    slotProcessDone( 0x0 );
 }
 
 void InstallDlg::slotProcessDone( Opie::Core::OProcess *proc )
 {
-    delete proc;
-
-    m_output->append( tr( "The package linking is done." ) );
-    m_output->setCursorPosition( m_output->numLines(), 0 );
-
+    if ( proc )
+    {
+        // Display message pnly if linking was done
+        m_output->append( tr( "The package linking is done." ) );
+        m_output->setCursorPosition( m_output->numLines(), 0 );
+        
+        delete proc;
+    }
+    
     // All commands executed, allow user to close dialog
     m_btnStart->setEnabled( true );