AGentooCat/i2p.i2p
1
0
Fork 0
forked from I2P_Developers/i2p.i2p
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Updating code to handle multiple(no limit) recursive levels.

Browse Source
This commit is contained in:
meeh
2018-05-01 03:35:09 +00:00
parent 975d8a069a
commit 6b0a102c1b
1 changed files with 25 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
launchers/common/src/main/scala/net/i2p/launchers/OSXDeployment.scala
View File

@@ -107,7 +107,14 @@ class OSXDeployment extends
"revocations",
"router",
"ssl"
),subDirectories=true)
),subDirectories=true),
new FDObjDir("themes",List(
"console",
"imagegen",
"snark",
"susidns",
"susimail"
),true)
)
/**
@@ -116,11 +123,16 @@ class OSXDeployment extends
* @param dir
* @return
*/
def copyDirFromRes(dir: File) = {
def copyDirFromRes(dir: File): Unit = {
// A small hack
val zipFile = new ZipFile(executingJarFile.getFile)
zipFile.entries().asScala.toList.filter(_.toString.startsWith(dir.getPath)).filter(!_.isDirectory).map { entry =>
copyBaseFileResToDisk(entry.getName, getClass.getResourceAsStream("/".concat(entry.getName)))
new File(DeployProfile.pathJoin(baseDir,entry.getName)).getParentFile.mkdirs()
if (entry.isDirectory) {
createFileOrDirectory(new File(DeployProfile.pathJoin(baseDir,entry.getName)), true)
} else {
copyBaseFileResToDisk(entry.getName, getClass.getResourceAsStream("/".concat(entry.getName)))
}
}
}
@@ -132,19 +144,20 @@ class OSXDeployment extends
* @param isDir
* @return
*/
def createFileOrDirectory(file: File, isDir: Boolean = false) = {
def createFileOrDirectory(file: File, isDir: Boolean = false): Unit = {
if (file != null) {
println(s"createFileOrDirectory(${file},${isDir})")
try {
// Make sure subject exists if directory
if (!new File(DeployProfile.pathJoin(baseDir,file.getPath)).exists()) {
if (isDir) {
// Handle dir
new File(DeployProfile.pathJoin(baseDir,file.getPath)).mkdirs()
copyDirFromRes(file)
} else {
// Handle file
copyBaseFileResToDisk(file.getPath, getClass.getResourceAsStream("/".concat(file.getName)))
}
if (isDir) new File(DeployProfile.pathJoin(baseDir,file.getPath)).mkdirs()
}
if (isDir) {
// Handle dir
copyDirFromRes(file)
} else {
// Handle file
copyBaseFileResToDisk(file.getPath, getClass.getResourceAsStream("/".concat(file.getName)))
}
} catch {
case ex:IOException => println(s"Error! Exception ${ex}")