Skip to content

Commit

Permalink
Fix for inaccurate detection of already-mounted disk images
Browse files Browse the repository at this point in the history
  • Loading branch information
@gregneagle
gregneagle committed May 8, 2018
1 parent 6cf7138 commit 4d8cae7
Show file tree
Hide file tree
Showing 7 changed files with 1,135 additions and 2 deletions.
295 changes: 295 additions & 0 deletions code/apps/MunkiStatusSwift/MunkiStatusSwift.xcodeproj/project.pbxproj
View file
@@ -0,0 +1,295 @@
// !$*UTF8*$!
{
archiveVersion = 1;
classes = {
};
objectVersion = 46;
objects = {

/* Begin PBXBuildFile section */
C0FBE8C620A164CF007527B9 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = C0FBE8C520A164CF007527B9 /* AppDelegate.swift */; };
C0FBE8C820A164CF007527B9 /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = C0FBE8C720A164CF007527B9 /* ViewController.swift */; };
C0FBE8CA20A164CF007527B9 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = C0FBE8C920A164CF007527B9 /* Assets.xcassets */; };
C0FBE8CD20A164CF007527B9 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = C0FBE8CB20A164CF007527B9 /* Main.storyboard */; };
/* End PBXBuildFile section */

/* Begin PBXFileReference section */
C0FBE8C220A164CF007527B9 /* MunkiStatusSwift.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = MunkiStatusSwift.app; sourceTree = BUILT_PRODUCTS_DIR; };
C0FBE8C520A164CF007527B9 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
C0FBE8C720A164CF007527B9 /* ViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ViewController.swift; sourceTree = "<group>"; };
C0FBE8C920A164CF007527B9 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
C0FBE8CC20A164CF007527B9 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = "<group>"; };
C0FBE8CE20A164CF007527B9 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
/* End PBXFileReference section */

/* Begin PBXFrameworksBuildPhase section */
C0FBE8BF20A164CF007527B9 /* Frameworks */ = {
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
);
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXFrameworksBuildPhase section */

/* Begin PBXGroup section */
C0FBE8B920A164CF007527B9 = {
isa = PBXGroup;
children = (
C0FBE8C420A164CF007527B9 /* MunkiStatusSwift */,
C0FBE8C320A164CF007527B9 /* Products */,
);
sourceTree = "<group>";
};
C0FBE8C320A164CF007527B9 /* Products */ = {
isa = PBXGroup;
children = (
C0FBE8C220A164CF007527B9 /* MunkiStatusSwift.app */,
);
name = Products;
sourceTree = "<group>";
};
C0FBE8C420A164CF007527B9 /* MunkiStatusSwift */ = {
isa = PBXGroup;
children = (
C0FBE8C520A164CF007527B9 /* AppDelegate.swift */,
C0FBE8C720A164CF007527B9 /* ViewController.swift */,
C0FBE8C920A164CF007527B9 /* Assets.xcassets */,
C0FBE8CB20A164CF007527B9 /* Main.storyboard */,
C0FBE8CE20A164CF007527B9 /* Info.plist */,
);
path = MunkiStatusSwift;
sourceTree = "<group>";
};
/* End PBXGroup section */

/* Begin PBXNativeTarget section */
C0FBE8C120A164CF007527B9 /* MunkiStatusSwift */ = {
isa = PBXNativeTarget;
buildConfigurationList = C0FBE8D120A164CF007527B9 /* Build configuration list for PBXNativeTarget "MunkiStatusSwift" */;
buildPhases = (
C0FBE8BE20A164CF007527B9 /* Sources */,
C0FBE8BF20A164CF007527B9 /* Frameworks */,
C0FBE8C020A164CF007527B9 /* Resources */,
);
buildRules = (
);
dependencies = (
);
name = MunkiStatusSwift;
productName = MunkiStatusSwift;
productReference = C0FBE8C220A164CF007527B9 /* MunkiStatusSwift.app */;
productType = "com.apple.product-type.application";
};
/* End PBXNativeTarget section */

/* Begin PBXProject section */
C0FBE8BA20A164CF007527B9 /* Project object */ = {
isa = PBXProject;
attributes = {
LastSwiftUpdateCheck = 0830;
LastUpgradeCheck = 0830;
ORGANIZATIONNAME = "The Munki Project";
TargetAttributes = {
C0FBE8C120A164CF007527B9 = {
CreatedOnToolsVersion = 8.3.3;
ProvisioningStyle = Automatic;
};
};
};
buildConfigurationList = C0FBE8BD20A164CF007527B9 /* Build configuration list for PBXProject "MunkiStatusSwift" */;
compatibilityVersion = "Xcode 3.2";
developmentRegion = English;
hasScannedForEncodings = 0;
knownRegions = (
en,
Base,
);
mainGroup = C0FBE8B920A164CF007527B9;
productRefGroup = C0FBE8C320A164CF007527B9 /* Products */;
projectDirPath = "";
projectRoot = "";
targets = (
C0FBE8C120A164CF007527B9 /* MunkiStatusSwift */,
);
};
/* End PBXProject section */

/* Begin PBXResourcesBuildPhase section */
C0FBE8C020A164CF007527B9 /* Resources */ = {
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
C0FBE8CA20A164CF007527B9 /* Assets.xcassets in Resources */,
C0FBE8CD20A164CF007527B9 /* Main.storyboard in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXResourcesBuildPhase section */

/* Begin PBXSourcesBuildPhase section */
C0FBE8BE20A164CF007527B9 /* Sources */ = {
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
C0FBE8C820A164CF007527B9 /* ViewController.swift in Sources */,
C0FBE8C620A164CF007527B9 /* AppDelegate.swift in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXSourcesBuildPhase section */

/* Begin PBXVariantGroup section */
C0FBE8CB20A164CF007527B9 /* Main.storyboard */ = {
isa = PBXVariantGroup;
children = (
C0FBE8CC20A164CF007527B9 /* Base */,
);
name = Main.storyboard;
sourceTree = "<group>";
};
/* End PBXVariantGroup section */

/* Begin XCBuildConfiguration section */
C0FBE8CF20A164CF007527B9 /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
CLANG_ANALYZER_NONNULL = YES;
CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
CLANG_CXX_LIBRARY = "libc++";
CLANG_ENABLE_MODULES = YES;
CLANG_ENABLE_OBJC_ARC = YES;
CLANG_WARN_BOOL_CONVERSION = YES;
CLANG_WARN_CONSTANT_CONVERSION = YES;
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
CLANG_WARN_EMPTY_BODY = YES;
CLANG_WARN_ENUM_CONVERSION = YES;
CLANG_WARN_INFINITE_RECURSION = YES;
CLANG_WARN_INT_CONVERSION = YES;
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
CLANG_WARN_SUSPICIOUS_MOVE = YES;
CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
CODE_SIGN_IDENTITY = "-";
COPY_PHASE_STRIP = NO;
DEBUG_INFORMATION_FORMAT = dwarf;
ENABLE_STRICT_OBJC_MSGSEND = YES;
ENABLE_TESTABILITY = YES;
GCC_C_LANGUAGE_STANDARD = gnu99;
GCC_DYNAMIC_NO_PIC = NO;
GCC_NO_COMMON_BLOCKS = YES;
GCC_OPTIMIZATION_LEVEL = 0;
GCC_PREPROCESSOR_DEFINITIONS = (
"DEBUG=1",
"$(inherited)",
);
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
GCC_WARN_UNDECLARED_SELECTOR = YES;
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
MACOSX_DEPLOYMENT_TARGET = 10.12;
MTL_ENABLE_DEBUG_INFO = YES;
ONLY_ACTIVE_ARCH = YES;
SDKROOT = macosx;
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
};
name = Debug;
};
C0FBE8D020A164CF007527B9 /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
CLANG_ANALYZER_NONNULL = YES;
CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
CLANG_CXX_LIBRARY = "libc++";
CLANG_ENABLE_MODULES = YES;
CLANG_ENABLE_OBJC_ARC = YES;
CLANG_WARN_BOOL_CONVERSION = YES;
CLANG_WARN_CONSTANT_CONVERSION = YES;
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
CLANG_WARN_EMPTY_BODY = YES;
CLANG_WARN_ENUM_CONVERSION = YES;
CLANG_WARN_INFINITE_RECURSION = YES;
CLANG_WARN_INT_CONVERSION = YES;
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
CLANG_WARN_SUSPICIOUS_MOVE = YES;
CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
CODE_SIGN_IDENTITY = "-";
COPY_PHASE_STRIP = NO;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
ENABLE_NS_ASSERTIONS = NO;
ENABLE_STRICT_OBJC_MSGSEND = YES;
GCC_C_LANGUAGE_STANDARD = gnu99;
GCC_NO_COMMON_BLOCKS = YES;
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
GCC_WARN_UNDECLARED_SELECTOR = YES;
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
MACOSX_DEPLOYMENT_TARGET = 10.12;
MTL_ENABLE_DEBUG_INFO = NO;
SDKROOT = macosx;
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
};
name = Release;
};
C0FBE8D220A164CF007527B9 /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
COMBINE_HIDPI_IMAGES = YES;
INFOPLIST_FILE = MunkiStatusSwift/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = com.googlecode.munki.MunkiStatusSwift;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 3.0;
};
name = Debug;
};
C0FBE8D320A164CF007527B9 /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
COMBINE_HIDPI_IMAGES = YES;
INFOPLIST_FILE = MunkiStatusSwift/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = com.googlecode.munki.MunkiStatusSwift;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 3.0;
};
name = Release;
};
/* End XCBuildConfiguration section */

/* Begin XCConfigurationList section */
C0FBE8BD20A164CF007527B9 /* Build configuration list for PBXProject "MunkiStatusSwift" */ = {
isa = XCConfigurationList;
buildConfigurations = (
C0FBE8CF20A164CF007527B9 /* Debug */,
C0FBE8D020A164CF007527B9 /* Release */,
);
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
C0FBE8D120A164CF007527B9 /* Build configuration list for PBXNativeTarget "MunkiStatusSwift" */ = {
isa = XCConfigurationList;
buildConfigurations = (
C0FBE8D220A164CF007527B9 /* Debug */,
C0FBE8D320A164CF007527B9 /* Release */,
);
defaultConfigurationIsVisible = 0;
};
/* End XCConfigurationList section */
};
rootObject = C0FBE8BA20A164CF007527B9 /* Project object */;
}
26 changes: 26 additions & 0 deletions code/apps/MunkiStatusSwift/MunkiStatusSwift/AppDelegate.swift
View file
@@ -0,0 +1,26 @@
//
// AppDelegate.swift
// MunkiStatusSwift
//
// Created by Greg Neagle on 5/7/18.
// Copyright © 2018 The Munki Project. All rights reserved.
//

import Cocoa

@NSApplicationMain
class AppDelegate: NSObject, NSApplicationDelegate {



func applicationDidFinishLaunching(_ aNotification: Notification) {
// Insert code here to initialize your application
}

func applicationWillTerminate(_ aNotification: Notification) {
// Insert code here to tear down your application
}


}

58 changes: 58 additions & 0 deletions code/apps/MunkiStatusSwift/MunkiStatusSwift/Assets.xcassets/AppIcon.appiconset/Contents.json
View file
@@ -0,0 +1,58 @@
{
"images" : [
{
"idiom" : "mac",
"size" : "16x16",
"scale" : "1x"
},
{
"idiom" : "mac",
"size" : "16x16",
"scale" : "2x"
},
{
"idiom" : "mac",
"size" : "32x32",
"scale" : "1x"
},
{
"idiom" : "mac",
"size" : "32x32",
"scale" : "2x"
},
{
"idiom" : "mac",
"size" : "128x128",
"scale" : "1x"
},
{
"idiom" : "mac",
"size" : "128x128",
"scale" : "2x"
},
{
"idiom" : "mac",
"size" : "256x256",
"scale" : "1x"
},
{
"idiom" : "mac",
"size" : "256x256",
"scale" : "2x"
},
{
"idiom" : "mac",
"size" : "512x512",
"scale" : "1x"
},
{
"idiom" : "mac",
"size" : "512x512",
"scale" : "2x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}

0 comments on commit 4d8cae7

Please sign in to comment.