AstralTransRocketries/OpenComputers
1
0
Fork 0
mirror of https://github.com/MightyPirates/OpenComputers.git synced 2025-09-15 02:12:42 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8

Browse Source
This commit is contained in:
Florian Nücke 2015-04-05 19:18:25 +02:00
commit aa61dd02d5
1 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/main/scala/li/cil/oc/util/LuaStateFactory.scala
View File

@ -4,8 +4,10 @@ import java.io.File
import java.io.FileInputStream
import java.io.FileOutputStream
import java.nio.channels.Channels
import java.util.regex.Pattern
import com.google.common.base.Strings
import com.google.common.io.PatternFilenameFilter
import li.cil.oc.OpenComputers
import li.cil.oc.Settings
import li.cil.oc.server.machine.Machine
@ -105,9 +107,21 @@ object LuaStateFactory {
else if (path.endsWith("/") || path.endsWith("\\")) path
else path + "/"
}
else ""
else "./"
val tmpLibFile = new File(tmpBasePath + tmpLibName)
// Clean up old library files when not in tmp dir.
if (!Settings.get.nativeInTmpDir) {
val libDir = new File(tmpBasePath)
if (libDir.isDirectory) {
for (file <- libDir.listFiles(new PatternFilenameFilter("^" + Pattern.quote("OpenComputersMod-") + ".*" + Pattern.quote("-" + libraryName) + "$"))) {
if (file.compareTo(tmpLibFile) != 0) {
file.delete()
}
}
}
}
// If the file, already exists, make sure it's the same we need, if it's
// not disable use of the natives.
if (tmpLibFile.exists()) {