MetzNet
/
dfhack
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Respect script path when running ruby scripts 

Fixes #1099
develop
lethosor 2017-06-01 16:20:26 -04:00
parent 044b3a0789
commit b28742cbd0
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
library/Core.cpp
Unescape Escape View File

@ -373,7 +373,7 @@ static command_result enableLuaScript(color_ostream &out, std::string name, bool
return ok ? CR_OK : CR_FAILURE; return ok ? CR_OK : CR_FAILURE;
} }
static command_result runRubyScript(color_ostream &out, PluginManager *plug_mgr, std::string name, vector<string> &args) static command_result runRubyScript(color_ostream &out, PluginManager *plug_mgr, std::string filename, vector<string> &args)
{ {
if (!plug_mgr->ruby || !plug_mgr->ruby->is_enabled()) if (!plug_mgr->ruby || !plug_mgr->ruby->is_enabled())
return CR_FAILURE; return CR_FAILURE;
@ -383,7 +383,7 @@ static command_result runRubyScript(color_ostream &out, PluginManager *plug_mgr,
rbcmd += "'" + args[i] + "', "; rbcmd += "'" + args[i] + "', ";
rbcmd += "]\n"; rbcmd += "]\n";
rbcmd += "catch(:script_finished) { load './hack/scripts/" + name + ".rb' }"; rbcmd += "catch(:script_finished) { load '" + filename + "' }";
return plug_mgr->ruby->eval_ruby(out, rbcmd.c_str()); return plug_mgr->ruby->eval_ruby(out, rbcmd.c_str());
} }
@ -1236,7 +1236,7 @@ command_result Core::runCommand(color_ostream &con, const std::string &first_, v
if ( lua ) if ( lua )
res = runLuaScript(con, first, parts); res = runLuaScript(con, first, parts);
else if ( filename != "" && plug_mgr->ruby && plug_mgr->ruby->is_enabled() ) else if ( filename != "" && plug_mgr->ruby && plug_mgr->ruby->is_enabled() )
res = runRubyScript(con, plug_mgr, first, parts); res = runRubyScript(con, plug_mgr, filename, parts);
else if ( try_autocomplete(con, first, completed) ) else if ( try_autocomplete(con, first, completed) )
res = CR_NOT_IMPLEMENTED; res = CR_NOT_IMPLEMENTED;
else else