[PC-BSD Commits] r7899 - in pcbsd/current/src-qt4/pc-sysmanager: . update-resources update-resources/bin

[svn at pcbsd.org]

Author: kris
Date: 2010-10-25 13:08:13 -0700 (Mon, 25 Oct 2010)
New Revision: 7899

Added:
   pcbsd/current/src-qt4/pc-sysmanager/update-resources/
   pcbsd/current/src-qt4/pc-sysmanager/update-resources/bin/downloadSysUpdates.sh
   pcbsd/current/src-qt4/pc-sysmanager/update-resources/bin/installSysUpdates.sh
   pcbsd/current/src-qt4/pc-sysmanager/update-resources/bin/readSysUpdates.sh
   pcbsd/current/src-qt4/pc-sysmanager/update-resources/bin/readSysUpdatesUser.sh
Removed:
   pcbsd/current/src-qt4/pc-sysmanager/update-resources/bin/downloadSysUpdates.sh
   pcbsd/current/src-qt4/pc-sysmanager/update-resources/bin/installSysUpdates.sh
   pcbsd/current/src-qt4/pc-sysmanager/update-resources/bin/readSysUpdates.sh
   pcbsd/current/src-qt4/pc-sysmanager/update-resources/bin/readSysUpdatesUser.sh
   pcbsd/current/src-qt4/pc-sysmanager/update-resources/system-updates/
Modified:
   pcbsd/current/src-qt4/pc-sysmanager/pc-sysmanager.pro
   pcbsd/current/src-qt4/pc-sysmanager/systemupdates.cpp
Log:

Moved shell backend of System Update framework into pc-sysmanager where it belongs



Modified: pcbsd/current/src-qt4/pc-sysmanager/pc-sysmanager.pro
===================================================================
--- pcbsd/current/src-qt4/pc-sysmanager/pc-sysmanager.pro	2010-10-25 19:53:32 UTC (rev 7898)
+++ pcbsd/current/src-qt4/pc-sysmanager/pc-sysmanager.pro	2010-10-25 20:08:13 UTC (rev 7899)
@@ -98,10 +98,19 @@
 sscreens.path = /usr/local/share/pcbsd/splash-screens/
 sscreens.files = splash-screens/*
 
+upbin.path = /usr/local/share/pcbsd/pc-sysmanager/bin/
+upbin.files = update-resources/bin/*
+
+upconf.path = /usr/local/share/pcbsd/pc-sysmanager/conf/
+upconf.files = update-resources/conf/*
+
+upimages.path = /usr/local/share/pcbsd/pc-sysmanager/images/
+upimages.files = update-resources/images/*
+
 chmod.path=/usr/local/share/pcbsd/scripts
-chmod.extra=cd /usr/local/share/pcbsd/scripts && chmod 755 *
+chmod.extra=cd /usr/local/share/pcbsd/scripts && chmod 755 * && cd /usr/local/share/pcbsd/pc-sysmanager/bin && chmod 755 *
 
-INSTALLS += dotrans scripts chmod sscreens
+INSTALLS += dotrans scripts upbin upconf upimages sscreens chmod
 
 QMAKE_LIBDIR = /usr/local/lib/qt4 /usr/local/lib
 

Modified: pcbsd/current/src-qt4/pc-sysmanager/systemupdates.cpp
===================================================================
--- pcbsd/current/src-qt4/pc-sysmanager/systemupdates.cpp	2010-10-25 19:53:32 UTC (rev 7898)
+++ pcbsd/current/src-qt4/pc-sysmanager/systemupdates.cpp	2010-10-25 20:08:13 UTC (rev 7899)
@@ -176,7 +176,7 @@
 void PBSystemTab::slotUpdateSysTrayTrigger()
 {
    // Save our date file with timestamp of last updates
-   QFile fileup( "/PCBSD/SystemUpdater/conf/.last-update" );
+   QFile fileup( SYSTRIGGER );
    if ( fileup.open( QIODevice::WriteOnly ) )
    {
       QTextStream streamup( &fileup );
@@ -232,7 +232,7 @@
   // Run our KIO Job to fetch the system-update patch data for this version of PC-BSD
 
   // First, get some variables to figure out the full patch URL
-  QFile file( "/PCBSD/SystemUpdater/conf/sysupdate.conf" );
+  QFile file( "/usr/local/share/pcbsd/pc-sysmanager/conf/sysupdate.conf" );
   if ( file.open( QIODevice::ReadOnly ) ) {
       QTextStream stream( &file );
       while ( !stream.atEnd() ) {
@@ -293,7 +293,7 @@
    // Now traverse the directory, see if we have updates.
   QString prog = "sh";
   QStringList args;
-  args << "/PCBSD/SystemUpdater/bin/readSysUpdates.sh" << Version;
+  args << "/usr/local/share/pcbsd/pc-sysmanager/bin/readSysUpdates.sh" << Version;
 
   // Check to see if the update download was successful and warn if not
   if ( sysFetchReply->error() != QNetworkReply::NoError )