From 248d51fffcf471c3a83e2eea3c01adc9fd361054 Mon Sep 17 00:00:00 2001
From: nianhua <1585346868@qq.com>
Date: Wed, 19 Jun 2024 17:11:45 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=BC=E5=AE=B9linux?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CMakeLists.txt    | 3 ++-
 tests/fastweb.cpp | 6 +++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e2eab0f..5d21a05 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -60,6 +60,7 @@ if(MSVC)
 else()
     include_directories(${PROJECT_SOURCE_DIR}/3rdparty)
     include_directories(/usr/local/include)
+	include_directories(/opt/lua54/include)
 	add_definitions(-DfPIC)
 endif()
 
@@ -106,7 +107,7 @@ else()
 			ylib
 			leveldb
 			crypto
-			lua
+			/opt/lua54/lib/liblua.a
 			pthread
 			sqlite3
 			dl
diff --git a/tests/fastweb.cpp b/tests/fastweb.cpp
index 4ea7b04..f758f68 100644
--- a/tests/fastweb.cpp
+++ b/tests/fastweb.cpp
@@ -246,7 +246,7 @@ void fastweb::uninstall_module(std::string ini_filepath, std::string name)
         }
     }
 #ifndef _WIN32
-    if(info.type == "lua")
+    if(info.type == "/opt/lua54/bin/lua")
     {
         std::cout<<"正在卸载 `"<<info.name_en<<"` 库"<<std::endl;
         auto [code,err] = execute_command("sudo luarocks remove "+info.name_en);
@@ -346,7 +346,7 @@ void fastweb::install_module_linux(fastweb::module_info info)
 {
   
     
-    if(exsit_install_software("lua") == false)
+    if(exsit_install_software("/opt/lua54/bin/lua") == false)
     {
         std::cout<<"LUA未安装，请重新执行fastweb一键构建脚本并确认lua编译安装部分正确执行"<<std::endl;
         return;
@@ -426,7 +426,7 @@ void fastweb::install_module_linux(fastweb::module_info info)
             return;
         }
         std::cout<<"正在安装 `"<<info.name_en<<"` 库"<<std::endl;
-        auto [code,err] = execute_command("sudo luarocks install "+info.name_en+" LUA_INCDIR=/usr/local/include LUA_LIBDIR=/usr/loca/lib/liblua.a");
+        auto [code,err] = execute_command("sudo luarocks install "+info.name_en+" LUA_INCDIR=/opt/lua54/include LUA_LIBDIR=/opt/lua54/lib");
         if(code == 0)
         {
             std::cout<<"安装成功"<<std::endl;