Skip to content
This repository has been archived by the owner on Nov 10, 2019. It is now read-only.

Commit

Permalink
1.3.2: 10.11.2 changes for NBImageInfo.plist
Browse files Browse the repository at this point in the history
  • Loading branch information
macmule committed Dec 9, 2015
1 parent c3da937 commit b239e28
Show file tree
Hide file tree
Showing 5 changed files with 146 additions and 50 deletions.
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,20 @@
<Bucket
type = "1"
version = "2.0">
<Breakpoints>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "AutoCasperNBI/AutoCasperNBIAppDelegate.applescript"
timestampString = "471362057.572257"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "4362"
endingLineNumber = "4362">
</BreakpointContent>
</BreakpointProxy>
</Breakpoints>
</Bucket>
115 changes: 115 additions & 0 deletions AutoCasperNBI/10.11NBImageInfo/NBImageInfo.plist
Original file line number Diff line number Diff line change
@@ -0,0 +1,115 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>OSBuildDetails</key>
<string>10.11.1 (15B42)</string>
<key>Architectures</key>
<array>
<string>i386</string>
</array>
<key>BackwardCompatible</key>
<false/>
<key>BootFile</key>
<string>booter</string>
<key>Description</key>
<string>No description</string>
<key>DisabledSystemIdentifiers</key>
<array>
<string>MacBookAir6,1</string>
<string>MacBookAir5,2</string>
<string>MacBookAir7,2</string>
<string>MacBookAir2,1</string>
<string>MacBookAir5,1</string>
<string>MacBookAir4,2</string>
<string>MacBookAir4,1</string>
<string>MacBookAir6,2</string>
<string>MacBookAir7,1</string>
<string>MacBookAir3,2</string>
<string>MacBookAir3,1</string>
<string>MacBookPro5,2</string>
<string>MacBookPro9,1</string>
<string>MacBookPro6,2</string>
<string>MacBookPro6,1</string>
<string>MacBookPro8,3</string>
<string>MacBookPro11,3</string>
<string>MacBookPro7,1</string>
<string>MacBookPro11,2</string>
<string>MacBookPro10,1</string>
<string>MacBookPro12,1</string>
<string>MacBookPro11,4</string>
<string>MacBookPro11,5</string>
<string>MacBookPro3,1</string>
<string>MacBookPro4,1</string>
<string>MacBookPro8,1</string>
<string>MacBookPro10,2</string>
<string>MacBookPro5,3</string>
<string>MacBookPro5,5</string>
<string>MacBookPro5,4</string>
<string>MacBookPro5,1</string>
<string>MacBookPro9,2</string>
<string>MacBookPro11,1</string>
<string>MacBookPro8,2</string>
<string>iMac14,2</string>
<string>iMac17,1</string>
<string>iMac9,1</string>
<string>iMac7,1</string>
<string>iMac12,1</string>
<string>iMac11,1</string>
<string>iMac14,4</string>
<string>iMac11,3</string>
<string>iMac13,2</string>
<string>iMac15,1</string>
<string>iMac12,2</string>
<string>iMac8,1</string>
<string>iMac10,1</string>
<string>iMac13,3</string>
<string>iMac16,1</string>
<string>iMac16,2</string>
<string>iMac14,1</string>
<string>iMac14,3</string>
<string>iMac13,1</string>
<string>iMac11,2</string>
<string>Macmini5,3</string>
<string>Macmini5,1</string>
<string>Macmini4,1</string>
<string>Macmini5,2</string>
<string>Macmini3,1</string>
<string>Macmini6,1</string>
<string>Macmini6,2</string>
<string>Macmini7,1</string>
<string>MacBook8,1</string>
<string>MacBook7,1</string>
<string>MacBook5,1</string>
<string>MacBook6,1</string>
<string>MacBook5,2</string>
<string>MacPro3,1</string>
<string>MacPro5,1</string>
<string>MacPro6,1</string>
<string>MacPro4,1</string>
<string>Xserve3,1</string>
</array>
<key>EnabledSystemIdentifiers</key>
<array/>
<key>Index</key>
<integer>42000</integer>
<key>IsDefault</key>
<false/>
<key>IsEnabled</key>
<false/>
<key>IsInstall</key>
<true/>
<key>Kind</key>
<integer>1</integer>
<key>Language</key>
<string>Default</string>
<key>Name</key>
<string>My NetInstall Image</string>
<key>RootPath</key>
<string>System.dmg</string>
<key>SupportsDiskless</key>
<false/>
<key>Type</key>
<string>HTTP</string>
</dict>
</plist>
2 changes: 1 addition & 1 deletion AutoCasperNBI/AutoCasperNBI-Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>1.3.1</string>
<string>1.3.2</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
Expand Down
63 changes: 14 additions & 49 deletions AutoCasperNBI/AutoCasperNBIAppDelegate.applescript
Original file line number Diff line number Diff line change
Expand Up @@ -1564,7 +1564,6 @@ script AutoCasperNBIAppDelegate
tell defaults to set my additionalPKGs to objectForKey_("additionalPKGs")
end deletePKG_


-- Check for Simple Finder on 10.11 & alert
on checkSimpleFinderElCap_(sender)
-- If we're creating a 10.11 NBI & enabling Simple Finder
Expand Down Expand Up @@ -1638,9 +1637,9 @@ script AutoCasperNBIAppDelegate
-- Checking variable
set isAdminUser to true
-- Make sure all variables are set if enabled
--buildPreCheck_(me)
buildPreCheck_(me)
-- Function for ElCap NBImageInfo.plist
elCapNBImageInfoPlist_(me)
--elCapNBImageInfoPlist_(me)
-- enable adminuser items
set my disableAdminUserCheck to false
-- stop cog
Expand Down Expand Up @@ -1671,7 +1670,7 @@ script AutoCasperNBIAppDelegate
set elCapNBImageInfoPlistExists to false
set useLatestNBImageInfo to false
-- If we're building an 10.11 NBI
if selectedOSdmgVersionMajor is equal to 11 then
if selectedOSdmgVersion is less than "10.11.2" then
--Log Action
set logMe to "Checking that we have a NBImageInfo.plist for " & selectedOSBuilddmgVersion
logToFile_(me)
Expand Down Expand Up @@ -2116,7 +2115,6 @@ script AutoCasperNBIAppDelegate
userNotify_(me)
-- Set to false
set my buildPreCheckPassed to false
else
end if
-- Build pre check is has been passed.
if buildPreCheckPassed is true then
Expand All @@ -2130,21 +2128,6 @@ script AutoCasperNBIAppDelegate

----- BUILD -----

on testFunction_(sender)
set netBootDmgMountPath to "/Volumes/10.11AutoCasperNBI"
set netBootDirectory to "/Users/administrator/Desktop/10.11AutoCasperNBI.nbi"
-- Disable main windows buttons
set my optionWindowEnabled to false
-- Update buildProcessLogTextField to show path to todays log
set my buildProcessLogTextField to "Today's Log: ~/Library/Logs/AutoCasperNBI/AutoCasperNBI-" & logDate & ".log"
-- Set netBootCreationSuccessful value, for notifying later
set my netBootCreationSuccessful to false
-- Set build Process ProgressBar to indeterminate & animated to false
set my buildProcessProgressBarIndeterminate to false
set my buildProcessProgressBarAniminate to false
generateKernelCache_(me)
end testFunction_

-- Create the .nbi folder
on netBootLocationCreate_(sender)
-- close admin check window
Expand Down Expand Up @@ -4383,35 +4366,17 @@ script AutoCasperNBIAppDelegate
-- Update build Process ProgressBar
set my buildProcessProgressBar to buildProcessProgressBar + 1
try
-- If we're building an OS newer than 10.11
if selectedOSdmgVersionMajor is equal to 11
-- If we're using the bespoke build version of NBImageInfo.plist
if useLatestNBImageInfo is false
--Log Action
set logMe to "Copying NBImageInfo.plist for " & selectedOSBuilddmgVersion
logToFile_(me)
-- Log that we're looking to copy a NBImageInfo.plist
set logMe to "/bin/cp " & quoted form of pathToResources & "/10.11NBImageInfo/" & selectedOSBuilddmgVersion & ".plist " & quoted form of netBootDirectory & "NBImageInfo.plist"
logToFile_(me)
-- Copy the plist
do shell script "/bin/cp " & quoted form of pathToResources & "/10.11NBImageInfo/" & selectedOSBuilddmgVersion & ".plist " & quoted form of netBootDirectory & "/NBImageInfo.plist" user name adminUserName password adminUsersPassword with administrator privileges
--Log Action
set logMe to "Copied NBImageInfo.plist"
logToFile_(me)
-- Updates NBImageInfo.plist
updateNBImageInfoPlist_(me)
else
--Log Action
set logMe to "Copying Latest 10.11 NBImageInfo.plist"
logToFile_(me)
-- Copy the plist
do shell script "/bin/cp " & quoted form of pathToResources & "/10.11NBImageInfo/Latest.plist " & quoted form of netBootDirectory & "/NBImageInfo.plist" user name adminUserName password adminUsersPassword with administrator privileges
--Log Action
set logMe to "Copied NBImageInfo.plist"
logToFile_(me)
-- Updates NBImageInfo.plist
updateNBImageInfoPlist_(me)
end if
-- If we're building a 10.11 - 10.11.1 NBI, then copy from 10.11NBImageInfo folder
if selectedOSdmgVersion is less than "10.11.2" then
--Log Action
set logMe to "Copying NBImageInfo.plist for 10.11 - 10.11.1"
logToFile_(me)
do shell script "/bin/cp " & quoted form of pathToResources & "/10.11NBImageInfo/NBImageInfo.plist " & quoted form of netBootDirectory & "/" user name adminUserName password adminUsersPassword with administrator privileges
--Log Action
set logMe to "Copied NBImageInfo.plist"
logToFile_(me)
-- Updates NBImageInfo.plist
updateNBImageInfoPlist_(me)
else
--Log Action
set logMe to "Copying NBImageInfo.plist"
Expand Down

0 comments on commit b239e28

Please sign in to comment.