Merge pull request #37 from TheNewNormal/v0.2.8

v0.2.8
TheNewNormal · Sep 16, 2016 · 409ad78 · 409ad78
2 parents 07b6e27 + f0da5ea
commit 409ad78
Show file tree

Hide file tree

Showing 12 changed files with 4 additions and 45 deletions.
diff --git a/src/bin/corectl b/src/bin/corectl
diff --git a/src/bin/corectld.runner b/src/bin/corectld.runner
diff --git a/src/bin/qcow-tool b/src/bin/qcow-tool
diff --git a/src/check_dns_status.command b/src/check_dns_status.command
diff --git a/src/corectl.xcodeproj/project.pbxproj b/src/corectl.xcodeproj/project.pbxproj
@@ -10,7 +10,6 @@
 		1318E2041D302A3400EC75E9 /* stop_docker_registry.command in Resources */ = {isa = PBXBuildFile; fileRef = 1318E2031D302A3400EC75E9 /* stop_docker_registry.command */; };
 		13278FF81D32A6B5001EF5F4 /* check_corectl_app_version.command in Resources */ = {isa = PBXBuildFile; fileRef = 13278FF71D32A6B5001EF5F4 /* check_corectl_app_version.command */; };
 		134476021D2E5F220035B3B9 /* check_active_vms.command in Resources */ = {isa = PBXBuildFile; fileRef = 134476011D2E5F220035B3B9 /* check_active_vms.command */; };
-		134B4DD21D6DC65D0018D004 /* check_dns_status.command in Resources */ = {isa = PBXBuildFile; fileRef = 134B4DD11D6DC65D0018D004 /* check_dns_status.command */; };
 		134DD75C1D2FEBF100E60CDE /* check_corectld_status.command in Resources */ = {isa = PBXBuildFile; fileRef = 134DD75B1D2FEBF100E60CDE /* check_corectld_status.command */; };
 		134DD75E1D300CE400E60CDE /* check_corectld_version.command in Resources */ = {isa = PBXBuildFile; fileRef = 134DD75D1D300CE400E60CDE /* check_corectld_version.command */; };
 		134F3CEC1D2C2270002B9668 /* check_blobs_version.command in Resources */ = {isa = PBXBuildFile; fileRef = 134F3CEB1D2C2270002B9668 /* check_blobs_version.command */; };
@@ -42,7 +41,6 @@
 		1318E2031D302A3400EC75E9 /* stop_docker_registry.command */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; path = stop_docker_registry.command; sourceTree = "<group>"; };
 		13278FF71D32A6B5001EF5F4 /* check_corectl_app_version.command */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; path = check_corectl_app_version.command; sourceTree = "<group>"; };
 		134476011D2E5F220035B3B9 /* check_active_vms.command */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; path = check_active_vms.command; sourceTree = "<group>"; };
-		134B4DD11D6DC65D0018D004 /* check_dns_status.command */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; path = check_dns_status.command; sourceTree = "<group>"; };
 		134DD75B1D2FEBF100E60CDE /* check_corectld_status.command */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; path = check_corectld_status.command; sourceTree = "<group>"; };
 		134DD75D1D300CE400E60CDE /* check_corectld_version.command */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; path = check_corectld_version.command; sourceTree = "<group>"; };
 		134F3CEB1D2C2270002B9668 /* check_blobs_version.command */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; path = check_blobs_version.command; sourceTree = "<group>"; };
@@ -93,7 +91,6 @@
 				136605371D23CCB200D497A0 /* functions.sh */,
 				137597641D2BD5A5000CB88F /* copy_corectl_blobs.command */,
 				134476011D2E5F220035B3B9 /* check_active_vms.command */,
-				134B4DD11D6DC65D0018D004 /* check_dns_status.command */,
 				134DD75B1D2FEBF100E60CDE /* check_corectld_status.command */,
 				13599DA81D4776E8004F8F5A /* start_docker_registry.command */,
 				1318E2031D302A3400EC75E9 /* stop_docker_registry.command */,
@@ -227,7 +224,6 @@
 				134DD75E1D300CE400E60CDE /* check_corectld_version.command in Resources */,
 				136605391D23CCB200D497A0 /* functions.sh in Resources */,
 				137597651D2BD5A6000CB88F /* copy_corectl_blobs.command in Resources */,
-				134B4DD21D6DC65D0018D004 /* check_dns_status.command in Resources */,
 				1375975B1D2BA78E000CB88F /* bin in Resources */,
 				136605381D23CCB200D497A0 /* fetch_latest_iso_alpha.command in Resources */,
 				134DD75C1D2FEBF100E60CDE /* check_corectld_status.command in Resources */,

diff --git a/...roj/project.xcworkspace/xcuserdata/rmocevicius.xcuserdatad/UserInterfaceState.xcuserstate b/...roj/project.xcworkspace/xcuserdata/rmocevicius.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/src/corectl/HelpingFunctions.swift b/src/corectl/HelpingFunctions.swift
@@ -9,27 +9,6 @@
 import Foundation
 import Cocoa
 
-
-// check if DNS port 53 is free to be used
-func check_if_DNS_port_in_use() -> Bool {
-    //
-    let script = Bundle.main.resourcePath! + "/check_dns_status.command"
-    let status = shell(script, arguments: [])
-    NSLog("DNS port use status: '%@'",status)
-    //
-    if (status == "yes"){
-        // display the error message
-        let mText: String = "Corectl for macOS"
-        let infoText: String = "Cannot start \"corectld server\" as DNS port 53 is used by some application !!!"
-        displayWithMessage(mText, infoText: infoText)
-        return true
-    }
-    else {
-        return false
-    }
-
-}
-
 // check if corectl blobs exist
 func check_that_corectl_blobs_are_in_place() {
     // Get App's resource folder

diff --git a/src/corectl/Info.plist b/src/corectl/Info.plist
@@ -17,11 +17,11 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.2.7</string>
+	<string>0.2.8</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>143</string>
+	<string>147</string>
 	<key>LSApplicationCategoryType</key>
 	<string>public.app-category.utilities</string>
 	<key>LSMinimumSystemVersion</key>

diff --git a/src/corectl/ServerControl.swift b/src/corectl/ServerControl.swift
@@ -13,9 +13,6 @@ import Cocoa
 // start corectld server
 func ServerStart() {
 
-    // check if DNS port 53 is not in use
-    if check_if_DNS_port_in_use() {return}
-
     // send an alert about the user password
     let mText: String = "Corectl for macOS"
     let infoText: String = "You will be asked to type your \"user\" password, needed to start \"corectld\" server !!!"

diff --git a/src/docker_registry b/src/docker_registry
diff --git a/src/get_go_binaries/get_registry.sh b/src/get_go_binaries/get_registry.sh
@@ -16,7 +16,7 @@ cd $GOPATH/src/github.com/docker/distribution
 GOPATH=$(PWD)/Godeps/_workspace:$GOPATH make binaries
 
 cd $current_folder
-cp -f $GOPATH/src/github.com/docker/distribution/bin/registry ../docker_registry
+cp -f $GOPATH/src/github.com/docker/distribution/bin/registry ../registry
 
 # clean up go folder
-rm -fr $GOPATH/src/github.com/docker
+rm -fr $GOPATH/src/github.com/docker
diff --git a/src/registry/registry b/src/registry/registry