Ignore:
Timestamp:
Sep 20, 2018 2:38:44 AM (2 years ago)
Author:
meeh <meeh@…>
Branches:
master
Children:
e8decff5
Parents:
eb81cada
Message:

Mac OSX Launcher: A lot of bugfixes, refactoring and cleanup.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • launchers/macosx/I2PLauncher/SwiftMainDelegate.swift

    reb81cada r3c0a8cf  
    1414  //let statusItem = NSStatusBar.system().statusItem(withLength: NSSquareStatusItemLength )
    1515  let statusBarController = StatusBarController()
    16   let javaDetector = DetectJava()
     16  static let javaDetector = DetectJava()
    1717  static let objCBridge = SBridge()
    1818 
    1919  override init() {
    2020    super.init()
    21    
    22     self.javaDetector.findIt()
    23     if (!javaDetector.isJavaFound()) {
    24       print("Could not find java....")
    25       terminate("No java..")
     21    if (!SwiftMainDelegate.javaDetector.isJavaFound()) {
     22    SwiftMainDelegate.javaDetector.findIt()
     23      if (!SwiftMainDelegate.javaDetector.isJavaFound()) {
     24        print("Could not find java....")
     25        terminate("No java..")
     26      }
    2627    }
    27     let javaBinPath = self.javaDetector.javaHome
     28    let javaBinPath = SwiftMainDelegate.javaDetector.javaHome
    2829    RouterProcessStatus.knownJavaBinPath = javaBinPath
    2930    print("Found java home = ", javaBinPath)
     
    7879    i2pPath += "/Library/I2P"
    7980   
    80     //let javaBinPath = self.javaDetector.javaHome.replace(target: " ", withString: "\\ ")
    81    
    8281    let fileManager = FileManager()
    8382    var ok = ObjCBool(true)
Note: See TracChangeset for help on using the changeset viewer.