Fixed CI

MCJack123 · Dec 7, 2023 · fc101a9 · fc101a9
1 parent 8dbd561
commit fc101a9
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 8 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -188,8 +188,8 @@ jobs:
         copy x64\Release\CraftOS-PC.pdb CraftOS-PC.pdb
         copy x64\ReleaseC\CraftOS-PC.exe CraftOS-PC_console.exe
         copy x64\ReleaseC\CraftOS-PC.pdb CraftOS-PC_console.pdb
-        copy craftos2-lua\src\lua51.dll lua51.dll
-        copy craftos2-lua\src\lua51.pdb lua51.pdb
+        copy craftos2-lua\src\lua52.dll lua52.dll
+        copy craftos2-lua\src\lua52.pdb lua52.pdb
         # Remove buildtrees that kill the cache
         Remove-Item vcpkg\buildtrees\* -Force -Recurse -ErrorAction SilentlyContinue
     - name: Run CraftOSTest
@@ -210,13 +210,13 @@ jobs:
         path: |
           CraftOS-PC.exe
           CraftOS-PC_console.exe
-          lua51.dll
+          lua52.dll
     - name: Upload artifact symbols
       uses: actions/upload-artifact@v2
       with:
         name: CraftOS-PC-Artifact-Symbols
         path: |
           CraftOS-PC.pdb
           CraftOS-PC_console.pdb
-          lua51.pdb
+          lua52.pdb
   
diff --git a/src/apis/fs.cpp b/src/apis/fs.cpp
@@ -154,16 +154,17 @@ static int fs_list(lua_State *L) {
     lastCFunction = __func__;
     std::string str = checkstring(L, 1);
     const std::vector<path_t> possible_paths = fixpath_multiple(get_comp(L), str);
-    if (possible_paths.empty()) err(L, 1, "Not a directory");
+    if (possible_paths.empty()) err(L, 1, "No such file");
     bool gotdir = false;
     std::set<std::string> entries;
     for (const path_t& path : possible_paths) {
         if (std::regex_search((*path.begin()).native(), pathregex("^\\d+:"))) {
             try {
                 const FileEntry &d = get_comp(L)->virtualMounts[(unsigned)std::stoul((*path.begin()).native())]->path(path.lexically_relative(*path.begin()));
-                gotdir = true;
-                if (d.isDir) for (const auto& p : d.dir) entries.insert(p.first);
-                else gotdir = false;
+                if (d.isDir) {
+                    gotdir = true;
+                    for (const auto& p : d.dir) entries.insert(p.first);
+                }
             } catch (...) {continue;}
         } else {
             std::error_code e;