various interpolation fixes
parent
c16f464a3e
commit
8def175313
3
Rex.cpp
3
Rex.cpp
|
@ -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) )
|
||||||
{
|
{
|
||||||
|
|
|
@ -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.
|
||||||
|
|
|
@ -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() )
|
||||||
|
|
Loading…
Reference in New Issue