Changeset 3488db38 for launchers

Timestamp:

May 1, 2018 3:40:07 AM (2 years ago)

Author:

meeh <meeh@…>

Branches:

master

Children:

345e741

Parents:

8957c85

Message:

Moved a function to a more logic place.

Location:

launchers/common/src/main/scala/net/i2p/launchers

Files:

• DeployProfile.scala (modified) (1 diff)
• OSXDeployment.scala (modified) (2 diffs)

launchers/common/src/main/scala/net/i2p/launchers/DeployProfile.scala

@@ -18 +18 @@
   */
 object DeployProfile {
+
+
+  /**
+    * This function will find the executing jar. "myself"
+    * @return
+    */
+  def executingJarFile = getClass().getProtectionDomain().getCodeSource().getLocation()
 
   /**

launchers/common/src/main/scala/net/i2p/launchers/OSXDeployment.scala

@@ -77 +77 @@
   ) {
 
-  /**
-    * This function will find the executing jar. "myself"
-    * @return
-    */
-  def executingJarFile = getClass().getProtectionDomain().getCodeSource().getLocation()
 
 
@@ -126 +121 @@
   def copyDirFromRes(dir: File): Unit = {
     // A small hack
-    val zipFile = new ZipFile(executingJarFile.getFile)
+    val zipFile = new ZipFile(DeployProfile.executingJarFile.getFile)
     zipFile.entries().asScala.toList.filter(_.toString.startsWith(dir.getPath)).filter(!_.isDirectory).map { entry =>
       new File(DeployProfile.pathJoin(baseDir,entry.getName)).getParentFile.mkdirs()