diff --git a/readme.md b/readme.md index 715e9e4..a68fe53 100644 --- a/readme.md +++ b/readme.md @@ -24,9 +24,15 @@ How to install Corectl App for macOS ###Install: +Till `qcow-tool` is made to work as a standalone binary, for now please install missing library with `brew`: + +``` +brew install libev +``` + Open the downloaded `DMG` file and drag the App to /Applications, and start the `Corectl` from there. -Everytime you start App will be asked for your Mac user password, which will used to start `corectld` server as `root` is needed for the network to work. +Everytime you start App you will be asked for your Mac user password, which will used to start `corectl` server as `root`, it is needed for the network to work. How it works ------------ diff --git a/src/bin/corectl b/src/bin/corectl index 2dacc53..35f1785 100755 Binary files a/src/bin/corectl and b/src/bin/corectl differ diff --git a/src/bin/corectld b/src/bin/corectld index 921bbe1..35f1785 100755 Binary files a/src/bin/corectld and b/src/bin/corectld differ diff --git a/src/bin/corectld.runner b/src/bin/corectld.runner index 94084a1..eb50e28 100755 Binary files a/src/bin/corectld.runner and b/src/bin/corectld.runner differ diff --git a/src/bin/qcow-tool b/src/bin/qcow-tool index 45dcbf2..dab97fe 100755 Binary files a/src/bin/qcow-tool and b/src/bin/qcow-tool differ diff --git a/src/corectl.xcodeproj/project.pbxproj b/src/corectl.xcodeproj/project.pbxproj index b9e3c34..596f8a3 100644 --- a/src/corectl.xcodeproj/project.pbxproj +++ b/src/corectl.xcodeproj/project.pbxproj @@ -3,7 +3,7 @@ archiveVersion = 1; classes = { }; - objectVersion = 47; + objectVersion = 48; objects = { /* Begin PBXBuildFile section */ @@ -192,7 +192,7 @@ }; }; buildConfigurationList = 13CAFC211D2272B000E57ED4 /* Build configuration list for PBXProject "corectl" */; - compatibilityVersion = "Xcode 6.3"; + compatibilityVersion = "Xcode 8.0"; developmentRegion = English; hasScannedForEncodings = 0; knownRegions = ( diff --git a/src/corectl/AppDelegate.swift b/src/corectl/AppDelegate.swift index 66f42d7..b16750a 100644 --- a/src/corectl/AppDelegate.swift +++ b/src/corectl/AppDelegate.swift @@ -33,7 +33,7 @@ class AppDelegate: NSObject, NSApplicationDelegate { check_for_dmg() // enable launch at login - addToLoginItems() + //addToLoginItems() // run startMainFunctions() startMainFunctions() @@ -66,7 +66,7 @@ class AppDelegate: NSObject, NSApplicationDelegate { else { // let alert: NSAlert = NSAlert() - alert.messageText = "Restarting Corectld server will halt all your running VMs." + alert.messageText = "Restarting Corectl server will halt all your running VMs." alert.informativeText = "Are you sure you want to do that?" alert.alertStyle = NSAlertStyle.warning alert.addButton(withTitle: "OK") @@ -146,7 +146,7 @@ class AppDelegate: NSObject, NSApplicationDelegate { @IBAction func About(_ sender: NSMenuItem) { let version = Bundle.main.object(forInfoDictionaryKey: "CFBundleShortVersionString")as? String let mText: String = "Corectl for macOS v" + version! - let infoText: String = "A simple wrapper around the \"corectld\" server. Allows to have control your server via the Status Bar App." + let infoText: String = "A simple wrapper around the \"corectl\" server. Allows to have control it via the Status Bar App." displayWithMessage(mText, infoText: infoText) } @@ -282,7 +282,7 @@ class AppDelegate: NSObject, NSApplicationDelegate { else { // update menu item let menuItem : NSStatusItem = statusItem - menuItem.menu?.item(withTag: 10)?.title = "No Active VMs" + menuItem.menu?.item(withTag: 10)?.title = " Active VMs: 0" } } diff --git a/src/corectl/Info.plist b/src/corectl/Info.plist index 4831067..9f97828 100644 --- a/src/corectl/Info.plist +++ b/src/corectl/Info.plist @@ -17,11 +17,11 @@ CFBundlePackageType APPL CFBundleShortVersionString - 0.2.8 + 0.2.9 CFBundleSignature ???? CFBundleVersion - 147 + 149 LSApplicationCategoryType public.app-category.utilities LSMinimumSystemVersion diff --git a/src/corectl/ServerControl.swift b/src/corectl/ServerControl.swift index 507d132..cc73a54 100644 --- a/src/corectl/ServerControl.swift +++ b/src/corectl/ServerControl.swift @@ -30,7 +30,7 @@ func ServerStart() { task.waitUntilExit() // - DispatchQueue.main.asyncAfter(deadline: .now() + 0.4) { + DispatchQueue.main.asyncAfter(deadline: .now() + 0.10) { // let script = Bundle.main.resourcePath! + "/check_corectld_status.command" let status = shell(script, arguments: []) diff --git a/src/get_qcow-tool_libs.sh b/src/get_qcow-tool_libs.sh new file mode 100755 index 0000000..fff3c80 --- /dev/null +++ b/src/get_qcow-tool_libs.sh @@ -0,0 +1,2 @@ +# +dylibbundler -od -b -x bin/qcow-tool -p @executable_path/../libs diff --git a/src/libs/libev.4.dylib b/src/libs/libev.4.dylib new file mode 100644 index 0000000..4b2dbc8 Binary files /dev/null and b/src/libs/libev.4.dylib differ diff --git a/src/registry/registry b/src/registry/registry index 0662dcd..2db94a0 100755 Binary files a/src/registry/registry and b/src/registry/registry differ