// Author : Vadim SANDLER, Open CASCADE SAS (vadim.sandler@opencascade.com)
// Project : SALOME
// Module : Installation Wizard
-// Copyright : 2002-2009 CEA
+// Copyright : 2002-2010 CEA
#include "globals.h"
QString tmpDirName() { return QString( "/INSTALLWORK" ) + QString::number( getpid() ); }
#define TEMPDIRNAME tmpDirName()
+// uncomment next line to redirect all shell output (usually for errors) to /dev/null device
+// #define USE_DEV_NULL
+
// ================================================================
/*!
* Script
if ( !fi.exists() ) {
// VSR: Create directory and set permissions to allow other users to remove it
Script script;
- script << "mkdir" << QUOTE( fi.absFilePath() ) << ">& /dev/null" << "&&";
- script << "chmod 777" << QUOTE( fi.absFilePath() ) << ">& /dev/null";
+ script << "mkdir" << QUOTE( fi.absFilePath() );
+#ifdef USE_DEV_NULL
+ script << ">& /dev/null";
+#endif
+ script << "&&";
+ script << "chmod 777" << QUOTE( fi.absFilePath() );
+#ifdef USE_DEV_NULL
+ script << ">& /dev/null";
+#endif
___MESSAGE___( "script = " << script.script().latin1() );
if ( system( script.script().latin1() ) )
return false;
if ( !QFileInfo( aDir ).exists() ) {
// VSR: Create directory, other users should NOT have possibility to remove it!!!
Script script;
- script << "mkdir" << QUOTE( aDir ) << ">& /dev/null";
+ script << "mkdir" << QUOTE( aDir );
+#ifdef USE_DEV_NULL
+ script << ">& /dev/null";
+#endif
___MESSAGE___( "script = " << script.script().latin1() );
if ( system( script.script().latin1() ) )
return false;
.arg( __IW_VERSION_MINOR__ ) \
.arg( __IW_VERSION_PATCH__ ) );
QLabel* copyright = new QLabel( this, "copyright" );
- copyright->setText( "<b>Copyright</b> © 2007-2009 CEA/DEN" );
+ copyright->setText( "<b>Copyright</b> © 2007-2011 CEA/DEN" );
QFont font = title->font();
font.setPointSize( (int)( font.pointSize() * 1.8 ) );
title->setFont( font );
addLogo( pixmap( pxLogo ) );
// set defaults
- setVersion( "5.1.3" );
+ setVersion( "6.4.0" );
setCaption( tr( "SALOME %1" ).arg( myVersion ) );
- setCopyright( tr( "<h5>Copyright © 2007-2009 CEA/DEN, EDF R&D, OPEN CASCADE<br></h5>"
+ setCopyright( tr( "<h5>Copyright © 2007-2011 CEA/DEN, EDF R&D, OPEN CASCADE<br></h5>"
"<h5>Copyright © 2003-2007 OPEN CASCADE,<br>EADS/CCR, LIP6, CEA/DEN, CEDRAT, EDF R&D,<br>LEG, PRINCIPIA R&D, BUREAU VERITAS</h5>" ));
setLicense( tr( "<h5>GNU LGPL</h5>" ) );
int PID = (int)shellProcess->processIdentifier();
if ( PID > 0 ) {
Script script;
- script << "kill -9" << QString::number( PID ) << ">& /dev/null";
+ script << "kill -9" << QString::number( PID );
+#ifdef USE_DEV_NULL
+ script << ">& /dev/null";
+#endif
___MESSAGE___( "script: " << script.script().latin1() );
if ( system( script.script().latin1() ) ) {
// error
script << (*it).script() << "execute";
script << QUOTE( QFileInfo( QDir::cleanDirPath( targetFolder->text().stripWhiteSpace() ) ).absFilePath() );
script << QUOTE( QFileInfo( QDir::cleanDirPath( tempFolder->text().stripWhiteSpace() ) + TEMPDIRNAME ).absFilePath() );
+#ifdef USE_DEV_NULL
script << ">& /dev/null";
+#endif
___MESSAGE___( "script: " << script.script().latin1() );
if ( (*it).script().isEmpty() || system( script.script().latin1() ) ) {
QMessageBox::warning( this,
script << "cd" << QUOTE( rd.filePath( "config_files" ) ) << ";";
script << "remove_tmp.sh" << QUOTE( tempFolder->text().stripWhiteSpace() + TEMPDIRNAME );
script << QUOTE( getAllProducts( productsMap ) );
+#ifdef USE_DEV_NULL
script << ">& /dev/null";
+#endif
___MESSAGE___( "script = " << script.script().latin1() );
if ( system( script.script().latin1() ) ) {
// error
if ( rmDir && !tmpCreated.isNull() ) {
script.clear();
script << "rm -rf" << QUOTE( tmpCreated );
+#ifdef USE_DEV_NULL
script << ">& /dev/null";
+#endif
if ( system( script.script().latin1() ) ) {
// error
}
script << (*it).script() << "check_enabled";
script << QUOTE( QFileInfo( QDir::cleanDirPath( targetFolder->text().stripWhiteSpace() ) ).absFilePath() );
script << QUOTE( QFileInfo( QDir::cleanDirPath( tempFolder->text().stripWhiteSpace() ) + TEMPDIRNAME ).absFilePath() );
+#ifdef USE_DEV_NULL
script << ">& /dev/null";
+#endif
___MESSAGE___( "script: " << script.script().latin1() );
(*it).button()->setEnabled( !(*it).script().isEmpty() && !system( script.script().latin1() ) );
}
item = (QCheckListItem*)( item->nextSibling() );
}
// if something at all is selected
- if ( (int)toInstall.count() > 1 ) {
+ if ( (int)toInstall.count() > 0 ) {
if ( installType == Compile ) {
// update status label