Changeset 3db4432


Ignore:
Timestamp:
01/27/14 14:26:24 (9 months ago)
Author:
Ken Moore <ken@…>
Branches:
master, releng/10.0.1, releng/10.0.2, releng/10.0.3, releng/10.1
Children:
91dd0e1, 02643f3, 58798fb, f719bd8
Parents:
9d2fc702
Message:

And make sure the ~/.xprofile is executable again. Only use the "." method if it is in the script, otherwise I need to run it with sh when as a seperate command.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • src-qt4/PCDM/src/pcdm-xprocess.cpp

    r9d2fc702 r3db4432  
    143143  Backend::log("Starting session:"); 
    144144  if(QFile::exists(xhome+"/.xprofile")){ 
     145    //Make sure the file is executable 
     146    QFile::setPermissions(xhome+"/.xprofile", QFile::permissions(xhome+"/.xprofile") | QFile::ExeOwner | QFile::ExeGroup | QFile::ExeOther ); 
    145147    //Need to run a couple commands in sequence: so put them in a script file 
    146148    QStringList contents; 
    147     contents << "sh "+xhome+"/.xprofile"; 
     149    contents << ". "+xhome+"/.xprofile"; 
    148150    contents << cmd; //end with the actual command for the DE 
    149151    if( Backend::writeFile(xhome+"/.pcdmsessionstart", contents) ){ 
     
    153155      //Could not create script file, fallback on running them seperately 
    154156      Backend::log(" --Run user ~/.xprofile"); 
    155       QString xpro = ". "+xhome+"/.xprofile"; 
     157      QString xpro = "sh "+xhome+"/.xprofile"; 
    156158      this->start(xpro); 
    157159      this->waitForFinished(3000); 
Note: See TracChangeset for help on using the changeset viewer.