diff --git a/.DS_Store b/.DS_Store index 0efb4c9..82a3649 100644 Binary files a/.DS_Store and b/.DS_Store differ diff --git a/AutoImagrNBI.xcodeproj/project.xcworkspace/xcuserdata/btoms.xcuserdatad/UserInterfaceState.xcuserstate b/AutoImagrNBI.xcodeproj/project.xcworkspace/xcuserdata/btoms.xcuserdatad/UserInterfaceState.xcuserstate index acc6b2a..0ad4703 100755 Binary files a/AutoImagrNBI.xcodeproj/project.xcworkspace/xcuserdata/btoms.xcuserdatad/UserInterfaceState.xcuserstate and b/AutoImagrNBI.xcodeproj/project.xcworkspace/xcuserdata/btoms.xcuserdatad/UserInterfaceState.xcuserstate differ diff --git a/AutoImagrNBI/AutoImagrNBI-Info.plist b/AutoImagrNBI/AutoImagrNBI-Info.plist index f106ff1..9ac4d4f 100755 --- a/AutoImagrNBI/AutoImagrNBI-Info.plist +++ b/AutoImagrNBI/AutoImagrNBI-Info.plist @@ -15,11 +15,11 @@ CFBundlePackageType APPL CFBundleShortVersionString - 1.5.0 + 1.5.1 CFBundleSignature ???? CFBundleVersion - 40 + 43 LSApplicationCategoryType public.app-category.utilities LSMinimumSystemVersion diff --git a/AutoImagrNBI/AutoImagrNBIAppDelegate.applescript b/AutoImagrNBI/AutoImagrNBIAppDelegate.applescript index ab9a17d..e9dafe6 100755 --- a/AutoImagrNBI/AutoImagrNBIAppDelegate.applescript +++ b/AutoImagrNBI/AutoImagrNBIAppDelegate.applescript @@ -2617,18 +2617,45 @@ script AutoImagrNBIAppDelegate --Log Action set logMe to "Emptied " & netBootDmgMountPath & "/System/Library/Compositions/" logToFile_(me) - -- Update Build Process Window's Text Field - set my buildProcessTextField to "/System/Library/CoreServices/DefaultDesktop.jpg" - delay 0.1 - try - -- Remove DefaultDesktop.jpg's symbolic link, silently error is doesn't exist - do shell script "unlink " & quoted form of netBootDmgMountPath & "/System/Library/CoreServices/DefaultDesktop.jpg" user name adminUserName password adminUsersPassword with administrator privileges - -- Delete DefaultDesktop.jpg - do shell script "/bin/rm -rf " & quoted form of netBootDmgMountPath & "/System/Library/CoreServices/DefaultDesktop.jpg" user name adminUserName password adminUsersPassword with administrator privileges - end try - --Log Action - set logMe to "Deleted " & netBootDmgMountPath & "/System/Library/CoreServices/DefaultDesktop.jpg" - logToFile_(me) + if selectedOSdmgVersionMajor is less than 14 then + -- Update Build Process Window's Text Field + set my buildProcessTextField to "/System/Library/CoreServices/DefaultDesktop.jpg" + delay 0.1 + try + -- Remove DefaultDesktop.jpg's symbolic link, silently error is doesn't exist + do shell script "/bin/unlink " & quoted form of netBootDmgMountPath & "/System/Library/CoreServices/DefaultDesktop.jpg" user name adminUserName password adminUsersPassword with administrator privileges + -- Delete DefaultDesktop.jpg + do shell script "/bin/rm -rf " & quoted form of netBootDmgMountPath & "/System/Library/CoreServices/DefaultDesktop.jpg" user name adminUserName password adminUsersPassword with administrator privileges + end try + --Log Action + set logMe to "Deleted " & netBootDmgMountPath & "/System/Library/CoreServices/DefaultDesktop.jpg" + logToFile_(me) + else + -- Update Build Process Window's Text Field + set my buildProcessTextField to "/System/Library/CoreServices/DefaultBackground.jpg" + delay 0.1 + try + -- Remove DefaultDesktop.jpg's symbolic link, silently error is doesn't exist + do shell script "/bin/unlink " & quoted form of netBootDmgMountPath & "/System/Library/CoreServices/DefaultBackground.jpg" user name adminUserName password adminUsersPassword with administrator privileges + -- Delete DefaultDesktop.jpg + do shell script "/bin/rm -rf " & quoted form of netBootDmgMountPath & "/System/Library/CoreServices/DefaultBackground.jpg" user name adminUserName password adminUsersPassword with administrator privileges + end try + --Log Action + set logMe to "Deleted " & netBootDmgMountPath & "/System/Library/CoreServices/DefaultBackground.jpg" + logToFile_(me) + -- Update Build Process Window's Text Field + set my buildProcessTextField to "/System/Library/CoreServices/DefaultDesktop.heic" + delay 0.1 + try + -- Remove DefaultDesktop.jpg's symbolic link, silently error is doesn't exist + do shell script "/bin/unlink " & quoted form of netBootDmgMountPath & "/System/Library/CoreServices/DefaultDesktop.heic" user name adminUserName password adminUsersPassword with administrator privileges + -- Delete DefaultDesktop.jpg + do shell script "/bin/rm -rf " & quoted form of netBootDmgMountPath & "/System/Library/CoreServices/DefaultDesktop.heic" user name adminUserName password adminUsersPassword with administrator privileges + end try + --Log Action + set logMe to "Deleted " & netBootDmgMountPath & "/System/Library/CoreServices/DefaultDesktop.heic" + logToFile_(me) + end if -- Update Build Process Window's Text Field set my buildProcessTextField to "Emptying /System/Library/LinguisticData/" delay 0.1 @@ -3732,52 +3759,88 @@ script AutoImagrNBIAppDelegate on copyDesktopImage_(sender) -- If we have a desktop selected & we can find it if desktopImageExists is true - try - -- Update Build Process Window's Text Field - set my buildProcessTextField to "Copying Desktop Image" - delay 0.1 - -- Update build Process ProgressBar - set my buildProcessProgressBar to buildProcessProgressBar + 1 - -- Set variableVariable to path of DefaultDesktop.jpg - set variableVariable to netBootDmgMountPath & "/System/Library/CoreServices/DefaultDesktop.jpg" - --Log Action - set logMe to "Removing symbolic link on " & netBootDmgMountPath & "/System/Library/CoreServices/DefaultDesktop.jpg" - logToFile_(me) + -- Set to text + set customDesktopImagePath to customDesktopImagePath as text + if selectedOSdmgVersionMajor is less than 14 then try - -- Remove DefaultDesktop.jpg's symbolic link, silently error is doesn't exist - do shell script "unlink " & quoted form of netBootDmgMountPath & "/System/Library/CoreServices/DefaultDesktop.jpg" user name adminUserName password adminUsersPassword with administrator privileges + -- Update Build Process Window's Text Field + set my buildProcessTextField to "Copying Desktop Image" + delay 0.1 + -- Update build Process ProgressBar + set my buildProcessProgressBar to buildProcessProgressBar + 1 + --Log Action + set logMe to "Removing symbolic link on " & netBootDmgMountPath & "/System/Library/CoreServices/DefaultDesktop.jpg" + logToFile_(me) + try + -- Remove DefaultDesktop.jpg's symbolic link, silently error is doesn't exist + do shell script "/bin/unlink " & quoted form of netBootDmgMountPath & "/System/Library/CoreServices/DefaultDesktop.jpg" user name adminUserName password adminUsersPassword with administrator privileges + end try + --Log Action + set logMe to "Trying to copy " & customDesktopImagePath & " to " & netBootDmgMountPath & "/System/Library/CoreServices/DefaultDesktop.jpg" + logToFile_(me) + -- Copy selected image + do shell script "/bin/cp -r " & quoted form of customDesktopImagePath & " " & quoted form of netBootDmgMountPath & "/System/Library/CoreServices/DefaultDesktop.jpg" user name adminUserName password adminUsersPassword with administrator privileges + --Log Action + set logMe to "Copied " & customDesktopImagePath & " to " & netBootDmgMountPath & "/System/Library/CoreServices/DefaultDesktop.jpg" + logToFile_(me) + --Log Action + set logMe to "Trying to set permissions to 755 on " & quoted form of netBootDmgMountPath & "/System/Library/CoreServices/DefaultDesktop.jpg" + logToFile_(me) + -- Making writable + do shell script "/bin/chmod -R 755 " & quoted form of netBootDmgMountPath & "/System/Library/CoreServices/DefaultDesktop.jpg" user name adminUserName password adminUsersPassword with administrator privileges + --Log Action + set logMe to "Set permissions to 755 on " & quoted form of netBootDmgMountPath & "/System/Library/CoreServices/DefaultDesktop.jpg" + logToFile_(me) + -- Copy Imagr.app selected earlier + copyImagrApp_(me) + on error + --Log Action + set logMe to "Error: Copying Desktop Image" + logToFile_(me) + -- Set to false to display + set my userNotifyErrorHidden to false + -- Set Error message + set my userNotifyError to "Error: Copying Desktop Image" + -- Notify of errors or success + userNotify_(me) end try - -- Set to text - set customDesktopImagePath to customDesktopImagePath as text - --Log Action - set logMe to "Trying to copy " & customDesktopImagePath & " to " & netBootDmgMountPath & "/System/Library/CoreServices/DefaultDesktop.jpg" - logToFile_(me) - -- Copy selected image - do shell script "cp -r " & quoted form of customDesktopImagePath & " " & quoted form of netBootDmgMountPath & "/System/Library/CoreServices/DefaultDesktop.jpg" user name adminUserName password adminUsersPassword with administrator privileges - --Log Action - set logMe to "Copied " & customDesktopImagePath & " to " & netBootDmgMountPath & "/System/Library/CoreServices/DefaultDesktop.jpg" - logToFile_(me) - --Log Action - set logMe to "Trying to set permissions to 755 on " & quoted form of netBootDmgMountPath & "/System/Library/CoreServices/DefaultDesktop.jpg" - logToFile_(me) - -- Making writable - do shell script "/bin/chmod -R 755 " & quoted form of netBootDmgMountPath & "/System/Library/CoreServices/DefaultDesktop.jpg" user name adminUserName password adminUsersPassword with administrator privileges - --Log Action - set logMe to "Set permissions to 755 on " & quoted form of netBootDmgMountPath & "/System/Library/CoreServices/DefaultDesktop.jpg" - logToFile_(me) - -- Copy Imagr.app selected earlier - copyImagrApp_(me) - on error - --Log Action - set logMe to "Error: Copying Desktop Image" - logToFile_(me) - -- Set to false to display - set my userNotifyErrorHidden to false - -- Set Error message - set my userNotifyError to "Error: Copying Desktop Image" - -- Notify of errors or success - userNotify_(me) - end try + else + try + -- Update Build Process Window's Text Field + set my buildProcessTextField to "Copying Desktop Image" + delay 0.1 + -- Update build Process ProgressBar + set my buildProcessProgressBar to buildProcessProgressBar + 1 + --Log Action + set logMe to "Trying to copy " & customDesktopImagePath & " to " & netBootDmgMountPath & "/Library/Desktop Pictures/Mojave.heic" + logToFile_(me) + -- Copy selected image + do shell script "/bin/cp -r " & quoted form of customDesktopImagePath & " " & quoted form of netBootDmgMountPath & "/Library/Desktop\\ Pictures/Mojave.heic" user name adminUserName password adminUsersPassword with administrator privileges + --Log Action + set logMe to "Copied " & customDesktopImagePath & " to " & netBootDmgMountPath & "/Library/Desktop Pictures/Mojave.heic" + logToFile_(me) + --Log Action + set logMe to "Trying to set permissions to 755 on " & quoted form of netBootDmgMountPath & "/Library/Desktop Pictures/Mojave.heic" + logToFile_(me) + -- Making writable + do shell script "/bin/chmod -R 755 " & quoted form of netBootDmgMountPath & "/Library/Desktop\\ Pictures/Mojave.heic" user name adminUserName password adminUsersPassword with administrator privileges + --Log Action + set logMe to "Set permissions to 755 on " & quoted form of netBootDmgMountPath & "/Library/Desktop Pictures/Mojave.heic" + logToFile_(me) + -- Copy Imagr.app selected earlier + copyImagrApp_(me) + on error + --Log Action + set logMe to "Error: Copying Desktop Image" + logToFile_(me) + -- Set to false to display + set my userNotifyErrorHidden to false + -- Set Error message + set my userNotifyError to "Error: Copying Desktop Image" + -- Notify of errors or success + userNotify_(me) + end try + end if else -- Copy Imagr.app selected earlier copyImagrApp_(me)