Changeset 027bbae


Ignore:
Timestamp:
May 7, 2013 9:35:45 AM (12 months ago)
Author:
Kris Moore <kris@…>
Branches:
master, 9.2-release, releng/10.0, releng/10.0.1
Children:
19abd58
Parents:
1fbc840
Message:

Setup pc-installgui to switch between the default pc-sysinstall and a debug copy, if it exists

Location:
src-qt4/pc-installgui
Files:
1 deleted
3 edited

Legend:

Unmodified
Added
Removed
  • src-qt4/pc-installgui/backend.cpp

    r1620346 r027bbae  
    5151{ 
    5252  QString line; 
     53  QString PCSYSINSTALL; 
     54  if ( QFile::exists("/root/pc-sysinstall/pc-sysinstall") )   
     55     PCSYSINSTALL = "/root/pc-sysinstall/pc-sysinstall"; 
     56  else   
     57     PCSYSINSTALL = "/usr/local/sbin/pc-sysinstall"; 
    5358 
    5459  QProcess p; 
  • src-qt4/pc-installgui/backend.h

    r1620346 r027bbae  
    99#include <QProcess> 
    1010#include <QByteArray> 
     11#include <QFile> 
    1112#include <QWidget> 
    1213 
    13 #define PCSYSINSTALL    QString("/usr/local/sbin/pc-sysinstall") 
    14 #define PCSYSINSTALLDIR QString("/usr/local/share/pc-sysinstall") 
     14 
    1515#define PCSYSINSTALLCFG QString("/tmp/sys-install.cfg") 
    1616#define TMPLANGFILE QString("/tmp/.SysInstallLang") 
     
    3434public: 
    3535    Process(const QStringList &args) { 
     36        QString PCSYSINSTALL; 
    3637        setReadChannel(QProcess::StandardOutput); 
     38        // If we are using a debug copy of pc-sysinstall, we can execute that instead of default 
     39        if ( QFile::exists("/root/pc-sysinstall/pc-sysinstall") ) 
     40          PCSYSINSTALL = "/root/pc-sysinstall/pc-sysinstall"; 
     41        else 
     42          PCSYSINSTALL = "/usr/local/sbin/pc-sysinstall"; 
    3743        start(PCSYSINSTALL, args); 
    3844    } 
     
    6066    //static QList<QStringList> slices(); 
    6167 
     68private: 
     69  QString PCSYSINSTALL; 
     70  QString PCSYSINSTALLDIR; 
    6271}; 
    6372 
  • src-qt4/pc-installgui/installer.cpp

    r30e98ce r027bbae  
    12841284 
    12851285  // Start our process to begin the install 
     1286  QString PCSYSINSTALL; 
     1287  if ( QFile::exists("/root/pc-sysinstall/pc-sysinstall") )   
     1288     PCSYSINSTALL = "/root/pc-sysinstall/pc-sysinstall"; 
     1289  else   
     1290     PCSYSINSTALL = "/usr/local/sbin/pc-sysinstall"; 
     1291 
    12861292  QString program = PCSYSINSTALL; 
    12871293  QStringList arguments; 
Note: See TracChangeset for help on using the changeset viewer.