X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=kernel%2Fappli%2FbbPlugPackage%2FbbPlugPackage.cpp;fp=kernel%2Fappli%2FbbPlugPackage%2FbbPlugPackage.cpp;h=ed0d026862dfed5f301a58c785f6649ec4a6f1fe;hb=a39a5800b5e01f19a4f2d0ccf0ad7754a30e69a2;hp=8ced93949321a22c41a3e11b1fbd1a412bd4ab4c;hpb=65406bab226a7a7d2a6971c27c6f64c3283d768b;p=bbtk.git diff --git a/kernel/appli/bbPlugPackage/bbPlugPackage.cpp b/kernel/appli/bbPlugPackage/bbPlugPackage.cpp index 8ced939..ed0d026 100644 --- a/kernel/appli/bbPlugPackage/bbPlugPackage.cpp +++ b/kernel/appli/bbPlugPackage/bbPlugPackage.cpp @@ -67,10 +67,15 @@ int main(int argc, char **argv) f.close(); - + std::cout << "executing update file: bbtk_config.xml " << std::endl; ConfigurationFile::GetInstance().AddPackagePathsAndWrite( path ); std::string command; + +#ifdef __APPLE__ + command = "source ~/.bashrc ; " + command; +#endif + #if defined(WIN32) command = "\""; #endif @@ -81,17 +86,20 @@ int main(int argc, char **argv) command += "\""; #endif command += " " + pname + " -q"; - std::cout << "executing '" << command << "'" << std::endl; -if ( system ( command.c_str() ) ) - { - std::cout << "An error occured while running '" - << command << "'" << std::endl; - // return 1; Feature #1676 - DFGO - } - - + std::cout << "(SKIP EED) executing '" << command << "'" << std::endl; +//if ( system ( command.c_str() ) ) +// { +// std::cout << "An error occured while running '" +// << command << "'" << std::endl; +// // return 1; Feature #1676 - DFGO +// } command = ""; + +#ifdef __APPLE__ + command = "source ~/.bashrc ; " + command; +#endif + #if defined(WIN32) command = "\""; #endif @@ -102,18 +110,18 @@ if ( system ( command.c_str() ) ) command += "\""; #endif command += " -q"; - std::cout << "executing '" << command << "'" << std::endl; - if ( ! system ( command.c_str() ) ) - { - std::cout << "Package '" - << pname << "' successfully plugged in" << std::endl; - } - else - { - std::cout << "An error occured while running '" - << command << "'" << std::endl; - //return 1; Feature #1676 - DFGO - } + std::cout << "(SKIP EED) executing '" << command << "'" << std::endl; + +// if ( ! system ( command.c_str() ) ) +// { +// std::cout << "Package '" +// << pname << "' successfully plugged in" << std::endl; +// } else { +// std::cout << "An error occured while running '" +// << command << "'" << std::endl; +// //return 1; Feature #1676 - DFGO +// } + return (int)0; } //==========================================================================