Applied patch from Cwiiis to fix linking of apps to root when installed elsewhere

2 files changed, 91 insertions, 3 deletions

diff --git a/noncore/settings/aqpkg/ipkg.cpp b/noncore/settings/aqpkg/ipkg.cpp
index 420863c..17efda9 100644
--- a/noncore/settings/aqpkg/ipkg.cpp
+++ b/noncore/settings/aqpkg/ipkg.cpp
@@ -144,5 +144,4 @@ void Ipkg :: runIpkg()
 
     executeIpkgCommand( commands, option );
-
 }
 
@@ -275,4 +274,62 @@ void Ipkg :: removeStatusEntry()
  }
 
+int Ipkg :: executeIpkgLinkCommand( QStringList *cmd )
+{
+    // If one is already running - should never be but just to be safe
+    if ( proc )
+    {
+        delete proc;
+        proc = 0;
+    }
+
+    // OK we're gonna use OProcess to run this thing
+    proc = new OProcess();
+    aborted = false;
+
+    // Connect up our slots
+    connect(proc, SIGNAL(processExited(Opie::Core::OProcess*)),
+            this, SLOT( linkProcessFinished()));
+    connect(proc, SIGNAL(receivedStdout(Opie::Core::OProcess*,char*,int)),
+            this, SLOT(linkCommandStdout(Opie::Core::OProcess*,char*,int)));
+
+     *proc << *cmd;
+
+    if(!proc->start(OProcess::NotifyOnExit, OProcess::All))
+    {
+        emit outputText( tr("Couldn't start ipkg-link process" ) );
+    }
+}
+
+void Ipkg::linkProcessFinished()
+{
+    // Report that the link process succeeded/failed
+
+    if ( error )
+        emit outputText( tr("Symbolic linking failed!\n") );
+    else
+        emit outputText( tr("Symbolic linking succeeded.\n") );
+
+    delete proc;
+    proc = 0;
+    finished = true;
+}
+
+void Ipkg::linkCommandStdout(OProcess*, char *buffer, int buflen)
+{
+    QString lineStr = buffer;
+    if ( lineStr[buflen-1] == '\n' )
+        buflen --;
+    lineStr = lineStr.left( buflen );
+    emit outputText( lineStr );
+
+    if ( lineStr.find( " not found." ) != -1 )
+    {
+        // Capture ipkg-link errors
+        error = true;
+    }
+
+    buffer[0] = '\0';
+}
+
 int Ipkg :: executeIpkgCommand( QStringList &cmd, const QString /*option*/ )
 {
@@ -384,11 +441,38 @@ void Ipkg :: linkPackage( const QString &packFileName, const QString &dest, cons
         return;
 
+    if( option == "remove" || option == "reinstall" || option == "upgrade" )
+    {
+        QStringList commands;
+
+        if ( runtimeDir != "" )
+        {
+            commands << "cd ";
+            commands << runtimeDir;
+            commands << ";";
+        }
+        commands << "ipkg-link" << "remove" << packFileName;
+        executeIpkgLinkCommand( &commands );
+    }
+
+    if( option == "install" || option == "reinstall" || option == "upgrade" )
+    {
+        QStringList commands;
+        if ( runtimeDir != "" )
+        {
+            commands << "cd ";
+            commands << runtimeDir;
+            commands << ";";
+        }
+        commands << "ipkg-link" << "add" << packFileName;
+        executeIpkgLinkCommand( &commands );
+    }
+/*
     qApp->processEvents();
     QStringList *fileList = getList( packFileName, destDir );
     qApp->processEvents();
     processFileList( fileList, destDir );
-    delete fileList;
+    delete fileList;*/
 }
-
+/*
 QStringList* Ipkg :: getList( const QString &packageFilename, const QString &destDir )
 {
@@ -520,2 +604,3 @@ void Ipkg :: processLinkDir( const QString &file, const QString &destDir, const
     }
 }
+*/
diff --git a/noncore/settings/aqpkg/ipkg.h b/noncore/settings/aqpkg/ipkg.h
index e216d17..5df63f1 100644
--- a/noncore/settings/aqpkg/ipkg.h
+++ b/noncore/settings/aqpkg/ipkg.h
@@ -71,6 +71,8 @@ signals:
 
 public slots:
+    void linkCommandStdout(Opie::Core::OProcess*, char *buffer, int buflen);
     void commandStdout(Opie::Core::OProcess*, char *buffer, int buflen);
     void commandStderr(Opie::Core::OProcess*, char *buffer, int buflen);
+    void linkProcessFinished();
     void processFinished();
     void abort();
@@ -93,4 +95,5 @@ private:
     QList<QString> *dependantPackages;
 
+    int executeIpkgLinkCommand( QStringList *cmd );
     int executeIpkgCommand( QStringList &cmd, const QString option );
     void removeStatusEntry();