diff --git a/src/core/modulemanager.cpp b/src/core/modulemanager.cpp index db144b4..34a5671 100644 --- a/src/core/modulemanager.cpp +++ b/src/core/modulemanager.cpp @@ -120,8 +120,8 @@ void fastweb::module_manager::start() #ifndef _WIN32 // Linux { - m_lua_include_path += ";/usr/local/lib/lua/5.3/?.lua"; - m_lua_include_cpath += ";/usr/local/share/lua/5.3/?.lua"; + m_lua_include_path += ";/opt/luarocks/lib/lua/5.4/?.lua"; + m_lua_include_cpath += ";/opt/luarocks/lib/lua/5.4/?.so"; } #endif // 用户 diff --git a/src/utils/parseconfig.hpp b/src/utils/parseconfig.hpp index 550148f..841b61c 100644 --- a/src/utils/parseconfig.hpp +++ b/src/utils/parseconfig.hpp @@ -3,6 +3,7 @@ #include #include #include +#include #include "util/ini.h" #include "util/file.h" #include "util/system.h" @@ -44,7 +45,7 @@ std::tuple parseconfig(ylib::ini &ini,const std::string& ini_f src_content = strutils::replace(src_content, "${current_dir}", strutils::replace(system::current_dir(),'\\','/')); // 配置文件目录 { - std::string ini_dir = ylib::file::parent_dir(ini_filepath); + std::string ini_dir = ylib::file::parent_dir(std::filesystem::absolute(ini_filepath).string()); src_content = strutils::replace(strutils::replace(src_content, "${config_dir}", ini_dir), '\\', '/'); } @@ -68,4 +69,4 @@ std::tuple parseconfig(ylib::ini &ini,const std::string& ini_f ini.open(temp_filepath); return std::make_tuple(true,""); -} \ No newline at end of file +} diff --git a/tests/fastweb.cpp b/tests/fastweb.cpp index f758f68..3f26acb 100644 --- a/tests/fastweb.cpp +++ b/tests/fastweb.cpp @@ -426,7 +426,7 @@ void fastweb::install_module_linux(fastweb::module_info info) return; } std::cout<<"正在安装 `"<