SILO-GROUP
/
rex
1
0
Fork 0
Code Issues 2 Pull Requests Releases 4 Activity

various interpolation fixes

master
phanes 2022-01-23 04:47:15 -05:00
parent c16f464a3e
commit 8def175313
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Rex.cpp
View File

@ -146,6 +146,9 @@ int main( int argc, char * argv[] )
help_flag = true; help_flag = true;
} }
interpolate( config_path );
interpolate( plan_path );
// if the user wants the help screen, just show it and leave // if the user wants the help screen, just show it and leave
if ( (help_flag) | (! config_flag) | (! plan_flag) ) if ( (help_flag) | (! config_flag) | (! plan_flag) )
{ {

3
src/loaders/abstract/Conf.cpp
View File

@ -73,7 +73,6 @@ Conf::Conf(std::string filename, int LOG_LEVEL ): JSON_Loader(LOG_LEVEL ), slog(
std::string jval_s; std::string jval_s;
bool jval_b; bool jval_b;
// prepare context spaghetti // prepare context spaghetti
this->override_context = false; this->override_context = false;
@ -119,8 +118,6 @@ Conf::Conf(std::string filename, int LOG_LEVEL ): JSON_Loader(LOG_LEVEL ), slog(
} }
jval_s = {0}; jval_s = {0};
}; };
/// Conf::has_context_override - Specifies whether or not the override context function is enabled in the Conf file. /// Conf::has_context_override - Specifies whether or not the override context function is enabled in the Conf file.

4
src/loaders/abstract/Task.cpp
View File

@ -185,7 +185,7 @@ void Task::execute( Conf * configuration )
// END PREWORK // END PREWORK
// get the target execution command // get the target execution command
std::string target_command = this->definition.get_target(); std::string target_command = configuration->get_execution_context() + "/" + this->definition.get_target();
// check if context override // check if context override
if ( configuration->has_context_override() ) if ( configuration->has_context_override() )
@ -206,7 +206,7 @@ void Task::execute( Conf * configuration )
int space_index = target_command.find( delimiter ); int space_index = target_command.find( delimiter );
std::string bin_path = target_command.substr( 0, space_index ); std::string bin_path = target_command.substr( 0, space_index );
if ( exists( bin_path ) ) if ( exists( bin_path ) )
{ {
this->slog.log( E_DEBUG, "[ '" + task_name + "' ] Target executable found."); this->slog.log( E_DEBUG, "[ '" + task_name + "' ] Target executable found.");
} else { } else {