mirror/munki
1
0
Fork 0
mirror of https://github.com/munki/munki.git synced 2026-03-15 22:31:22 -05:00
Code Issues Packages Projects Releases Wiki Activity

Bumped to version 1.3.1.

Browse Source 
Fixed a bug when there are items to be removed causing them not to be displayed.
Added a restart status field at the bottom of the window to be more like Apple Software Update.

git-svn-id: http://munki.googlecode.com/svn/trunk@278 a4e17f2e-e282-11dd-95e1-755cbddbdd66
This commit is contained in:
Greg Neagle
2009-10-22 21:39:41 +00:00
parent 83e10ef4b6
commit 15cc60e8fe
3 changed files with 70 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
code/ManagedSoftwareUpdate/ManagedSoftwareUpdate.applescript
View File

@@ -89,34 +89,39 @@ on itemstoinstall()
set removallist to value of property list item "removals" of property list file InstallInfo
end tell
set removalcount to 0
set removalsrequirerestart to false
repeat with removalitem in removallist
if (installed of removalitem) is true then
set removalcount to removalcount + 1
try
if |RestartAction| of removalitem is "RequireRestart" then
set restartRequired to true
set removalsrequirerestart to true
end if
end try
if ShowRemovalDetail then
set display_name of removalitem to display_name of removalitem & " (will be removed)"
try
set display_name of removalitem to display_name of removalitem & " (will be removed)"
on error
set |name| of removalitem to |name| of removalitem & " (will be removed)"
end try
set end of installlist to (removalitem as item)
end if
end if
end repeat
if not ShowRemovalDetail then
if removalcount > 0 then
if restartRequired then
try
set |RestartAction| of removalitem to "RequireRestart"
on error
set removalitem to removalitem & {|RestartAction|:"RequireRestart"}
end try
set removalitem to {display_name:"Software removals", |description|:"Scheduled removal of managed software.", |RestartAction|:""}
if removalsrequirerestart then
set |RestartAction| of removalitem to "RequireRestart"
end if
set display_name of removalitem to "Software removals"
set |description| of removalitem to "Scheduled removal of managed software."
set end of installlist to (removalitem as item)
end if
end if
on error
display alert "Cannot read installation info" message ¬
"There is a problem with the managed software installation info. Contact your systems administrator." default button "Quit"
quit
end try
end if
return installlist as list
@@ -281,6 +286,9 @@ on activated theObject
if (count of installitems) > 0 then
my initTable()
my updateTable()
if restartRequired then
set contents of text field "RestartNoticeFld" of window "mainWindow" to "Updates require a restart."
end if
show window "mainWindow"
set enabled of (menu item "installAllMenuItem" of menu "updateMenu" of menu 1) to true
else