Added optional remote sheel config file for the remote startup command.

nasa · Sep 5, 2024 · e2c35d3 · e2c35d3
1 parent cca503a
commit e2c35d3
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/include/trick/Master.hh b/include/trick/Master.hh
@@ -83,6 +83,9 @@ namespace Trick {
               to change to that directory before calling S_main_name.\n */
             std::string sim_path;                 /**< trick_units(--) */
 
+            /** @userdesc Optional shell environment setup config file for the slave shell.\n */
+            std::string remote_shell_config_file; /**< trick_units(--) */
+
             /** @userdesc Slave executable name, default is "./S_main_${TRICK_HOST_CPU}.exe".\n */
             std::string S_main_name;              /**< trick_units(--) */
 

diff --git a/trick_source/sim_services/MasterSlave/Master.cpp b/trick_source/sim_services/MasterSlave/Master.cpp
@@ -127,6 +127,11 @@ int Trick::SlaveInfo::start() {
         startup_command << " 'cd " << sim_path << " ; " ;
     }
 
+    /** @li Set up remote shell environment if needed for the remote startup command */
+    if ( !remote_shell_config_file.empty() ) {
+        startup_command << " source " << remote_shell_config_file << " ; " ;
+    }
+
     if (strstr(passp->pw_shell, "csh")) {
         startup_command << " setenv TRICK_HOST_CPU `trick-gte TRICK_HOST_CPU` ; " ;
     } else {