Merge pull request #13 from Pika-Software/dev

Changes from `dev`
Pika-Software · May 22, 2023 · d63e1e0 · d63e1e0
2 parents 0e27ad0 + 9cf70db
commit d63e1e0
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/lua/gpm/fs.lua b/lua/gpm/fs.lua
@@ -101,7 +101,7 @@ function CreateDir( folderPath )
         if not folderName then continue end
 
         currentPath = currentPath and ( currentPath .. "/" .. folderName ) or folderName
-        if file.IsDir( currentPath, "DATA" ) then continue end
+        if IsDir( currentPath, "DATA" ) then continue end
 
         file.Delete( currentPath )
         file.CreateDir( currentPath )

diff --git a/lua/gpm/init.lua b/lua/gpm/init.lua
@@ -27,7 +27,7 @@ MsgN( [[
 
 module( "gpm", package.seeall )
 
-_VERSION = 012501
+_VERSION = 012502
 
 if not Colors then
     Colors = {
@@ -253,7 +253,7 @@ do
             metadata.import_path = importPath
             metadata.source = sourceName
 
-            if not metadata.singleplayer and SinglePlayer then
+            if metadata.singleplayer and not SinglePlayer then
                 return promise.Reject( "Package cannot be executed in a singleplayer game." )
             end
 

diff --git a/lua/gpm/package.lua b/lua/gpm/package.lua
@@ -379,7 +379,7 @@ Initialize = promise.Async( function( metadata, func, files )
 
     -- Saving in global table & final log
     local importPath = metadata.import_path
-    logger:Info( "[%s] Package '%s' was successfully imported, it took %.4f seconds.", pkg:GetSourceName(), importPath, SysTime() - stopwatch )
+    logger:Info( "[%s] Package '%s' was successfully imported, it took %.4f seconds.", pkg:GetSourceName(), pkg:GetIdentifier(), SysTime() - stopwatch )
     gpm.Packages[ importPath ] = pkg
 
     return pkg