resolves Issue-33

Co-authored-by: Josh <[email protected]>
mc-cc-scripts · Dec 3, 2023 · cb3cd8b · cb3cd8b
1 parent 1388dff
commit cb3cd8b
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 15 deletions.
diff --git a/libs/scm/net.lua b/libs/scm/net.lua
@@ -157,8 +157,8 @@ do
                                     .. config()[sourceObject.type .. "Suffix"]
                                     .. "/" .. filePaths[i], "w")
                             end
-                            tmpfile.write(tmpContent)
-                            tmpfile.close()
+                            tmpFile.write(tmpContent)
+                            tmpFile.close()
                         else
                             success = false
                         end
@@ -176,10 +176,10 @@ do
                 -- create a link that calls the file within the program directory
                 if sourceObject.type == "program" then
                     local progamLink = fs.open(sourceObject.name, "w")
-                    progamLink:write("shell.execute(\"" .. targetDirectory .. sourceObject.name ..
+                    progamLink.write("shell.execute(\"" .. targetDirectory .. sourceObject.name ..
                         config()[sourceObject.type .. "Suffix"]
                         .. "/" .. sourceObject.name .. ".lua" .. "\", ...)")
-                    progamLink:close()
+                    progamLink.close()
                 elseif sourceObject.type == "library" then
                     local libraryLink = fs.open(targetDirectory .. sourceObject.name .. ".lua", "w")
                     if not libraryLink then
@@ -192,10 +192,10 @@ do
                         tmpName = tmpName:match("(.+)%..+$")
                     end
 
-                    libraryLink:write("return require(\"./" .. config()["libraryDirectory"]
+                    libraryLink.write("return require(\"./" .. config()["libraryDirectory"]
                         .. tmpName .. config()[sourceObject.type .. "Suffix"]
                         .. "/" .. tmpName .. "\")")
-                    libraryLink:close()
+                    libraryLink.close()
                 end
 
                 return sourceObject, true

diff --git a/libs/scm/scriptManager.lua b/libs/scm/scriptManager.lua
@@ -136,10 +136,14 @@ do
         end
 
         -- delete file
-        if scriptType and fs.exists(config()[scriptType .. "Directory"] .. name .. ".lua") then
-            fs.delete(config()[scriptType .. "Directory"] .. name .. config()[scriptType .. "Suffix"])
+        local scriptDir = config()[scriptType .. "Directory"]
+        if scriptType and (
+            fs.exists(scriptDir .. name .. ".lua") or 
+            fs.exists(scriptDir .. name .. config()[scriptType .. "Suffix"])
+        ) then
+            fs.delete(scriptDir .. name .. config()[scriptType .. "Suffix"])
             if scriptType == "library" then
-                fs.delete(config()[scriptType .. "Directory"] .. name .. ".lua")
+                fs.delete(scriptDir .. name .. ".lua")
             end
         end
 

diff --git a/scm.lua b/scm.lua
@@ -1,11 +1,11 @@
 ---@class SCM
 SCM = {}
-require('libs.scm.config')
-require('libs.scm.net')
-require('libs.scm.log')
-require('libs.scm.scriptManager')
-require('libs.scm.autocomplete')
-require('libs.scm.ui')
+require('./libs.scm.config')
+require('./libs.scm.net')
+require('./libs.scm.log')
+require('./libs.scm.scriptManager')
+require('./libs.scm.autocomplete')
+require('./libs.scm.ui')
 
 function SCM:checkVersion()
     if not self.Config.config["updateAvailable"] and self.Config.config["lastVersionCheck"] ~= '' .. os.day("utc") then