mirror/munki
1
0
Fork 0
mirror of https://github.com/munki/munki.git synced 2026-04-22 12:38:23 -05:00
Code Issues Packages Projects Releases Wiki Activity

ManagedSoftwareUpdate:

Browse Source 
New icon. New copyright notice. New bundle ID (com.googlecode.munki.managedsoftareupdate).  Now recommends a logout before install even if a restart is not required.

git-svn-id: http://munki.googlecode.com/svn/trunk@73 a4e17f2e-e282-11dd-95e1-755cbddbdd66
This commit is contained in:
Greg Neagle
2009-05-20 16:22:59 +00:00
parent 13e91c27dc
commit bc8b3d2870
7 changed files with 28 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/ManagedSoftwareUpdate/English.lproj/InfoPlist.strings
BIN
View File
Binary file not shown.
code/ManagedSoftwareUpdate/English.lproj/MainMenu.xib
+11 -10
View File
@@ -2,13 +2,14 @@
<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.03">
<data>
<int key="IBDocument.SystemTarget">1050</int>
<string key="IBDocument.SystemVersion">9G55</string>
<string key="IBDocument.SystemVersion">9J61</string>
<string key="IBDocument.InterfaceBuilderVersion">677</string>
<string key="IBDocument.AppKitVersion">949.43</string>
<string key="IBDocument.AppKitVersion">949.46</string>
<string key="IBDocument.HIToolboxVersion">353.00</string>
<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
<bool key="EncodedWithXMLCoder">YES</bool>
<integer value="21"/>
<integer value="2"/>
<integer value="293"/>
</object>
<object class="NSArray" key="IBDocument.PluginDependencies">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -502,7 +503,7 @@ ZWFkeSB0byBpbnN0YWxsIG5vdywgeW91IGNhbiBjaG9vc2UgdG8gaW5zdGFsbCBsYXRlci4</string>
<int key="NSCellFlags2">33554432</int>
<object class="NSCustomResource" key="NSContents">
<string key="NSClassName">NSImage</string>
<string key="NSResourceName">Installer</string>
<string key="NSResourceName">Managed Software Update</string>
</object>
<reference key="NSSupport" ref="86217858"/>
<int key="NSAlign">0</int>
@@ -545,7 +546,7 @@ ZWFkeSB0byBpbnN0YWxsIG5vdywgeW91IGNhbiBjaG9vc2UgdG8gaW5zdGFsbCBsYXRlci4</string>
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSMenuItem" id="402782179">
<reference key="NSMenu" ref="43653270"/>
<string key="NSTitle">About ManagedSoftwareUpdate</string>
<string key="NSTitle">About Managed Software Update</string>
<string key="NSKeyEquiv"/>
<int key="NSMnemonicLoc">2147483647</int>
<reference key="NSOnImage" ref="173048731"/>
@@ -630,7 +631,7 @@ ZWFkeSB0byBpbnN0YWxsIG5vdywgeW91IGNhbiBjaG9vc2UgdG8gaW5zdGFsbCBsYXRlci4</string>
</object>
<object class="NSMenuItem" id="781815771">
<reference key="NSMenu" ref="43653270"/>
<string key="NSTitle">Quit ManagedSoftwareUpdate</string>
<string key="NSTitle">Quit Managed Software Update</string>
<string key="NSKeyEquiv">q</string>
<int key="NSKeyEquivModMask">1048576</int>
<int key="NSMnemonicLoc">2147483647</int>
@@ -1644,8 +1645,8 @@ ZWFkeSB0byBpbnN0YWxsIG5vdywgeW91IGNhbiBjaG9vc2UgdG8gaW5zdGFsbCBsYXRlci4</string>
<string key="appleScriptObjectName">mainWindow</string>
</object>
</object>
<string>{{354, 245}, {512, 562}}</string>
<string>{{354, 245}, {512, 562}}</string>
<string>{{161, 237}, {512, 562}}</string>
<string>{{161, 237}, {512, 562}}</string>
<reference ref="9"/>
<reference ref="9"/>
<string>{{616, 297}, {480, 360}}</string>
@@ -1653,7 +1654,7 @@ ZWFkeSB0byBpbnN0YWxsIG5vdywgeW91IGNhbiBjaG9vc2UgdG8gaW5zdGFsbCBsYXRlci4</string>
<reference ref="9"/>
<string>{3.40282e+38, 3.40282e+38}</string>
<string>{512, 400}</string>
<string>{{142, 673}, {387, 20}}</string>
<string>{{141, 673}, {387, 20}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="9"/>
<string>{74, 862}</string>
@@ -1680,7 +1681,7 @@ ZWFkeSB0byBpbnN0YWxsIG5vdywgeW91IGNhbiBjaG9vc2UgdG8gaW5zdGFsbCBsYXRlci4</string>
<reference ref="9"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="9"/>
<string>{{154, 520}, {307, 153}}</string>
<string>{{153, 520}, {316, 153}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="9"/>
<string>{{26, 652}, {245, 183}}</string>
code/ManagedSoftwareUpdate/Info.plist
+1 -1
View File
@@ -11,7 +11,7 @@
<key>CFBundleIconFile</key>
<string>${EXECUTABLE_NAME}</string>
<key>CFBundleIdentifier</key>
<string>com.apple.ASApplication</string>
<string>com.googlecode.munki.managedsoftwareupdate</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundlePackageType</key>
code/ManagedSoftwareUpdate/Managed Software Update.icns
BIN
View File
Binary file not shown.
code/ManagedSoftwareUpdate/ManagedSoftwareUpdate.applescript
+7 -3
View File
@@ -108,9 +108,9 @@ on clicked theObject
"A restart is required after installation. Log out and install now?" alternate button "Cancel" default button ¬
"Log out and install" as warning attached to window 1
else
--trigger ManagedInstaller
do shell script "/usr/bin/touch /var/spool/ManagedInstaller"
quit
display alert "Logout Recommeded" message ¬
"A logout is recommeded before installation. Log out and install now?" alternate button "Install without logging out" default button ¬
"Log out and install" as warning attached to window 1
end if
end if
end clicked
@@ -142,6 +142,10 @@ on alert ended theObject with reply withReply
end tell
quit
end if
if button returned of withReply is "Install without logging out" then
--trigger managedinstaller somehow
quit
end if
if button returned of withReply is "OK" then
-- acknowleged no new software available
quit
code/ManagedSoftwareUpdate/ManagedSoftwareUpdate.icns
BIN
View File
Binary file not shown.
code/ManagedSoftwareUpdate/ManagedSoftwareUpdate.xcodeproj/project.pbxproj
+9 -9
View File
@@ -27,7 +27,7 @@
257572CD072881A4000BE9CA /* AppleScriptKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DA206CF1015C4E2903C91932 /* AppleScriptKit.framework */; };
60A014C40DBD2AA20071D9A8 /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 60A014C20DBD2AA20071D9A8 /* MainMenu.xib */; };
C09152A20FB51AE1006BC8DE /* Empty.png in Resources */ = {isa = PBXBuildFile; fileRef = C09152A10FB51AE1006BC8DE /* Empty.png */; };
C09153060FB64FD1006BC8DE /* ManagedSoftwareUpdate.icns in Resources */ = {isa = PBXBuildFile; fileRef = C09153050FB64FD1006BC8DE /* ManagedSoftwareUpdate.icns */; };
C09153060FB64FD1006BC8DE /* Managed Software Update.icns in Resources */ = {isa = PBXBuildFile; fileRef = C09153050FB64FD1006BC8DE /* Managed Software Update.icns */; };
C0ACDAA70FB4A387006D30B3 /* Installer.tiff in Resources */ = {isa = PBXBuildFile; fileRef = C0ACDA9A0FB4A386006D30B3 /* Installer.tiff */; };
C0ACDAAC0FB4A387006D30B3 /* package.tiff in Resources */ = {isa = PBXBuildFile; fileRef = C0ACDA9F0FB4A386006D30B3 /* package.tiff */; };
C0ACDAAD0FB4A387006D30B3 /* Restart.tif in Resources */ = {isa = PBXBuildFile; fileRef = C0ACDAA00FB4A386006D30B3 /* Restart.tif */; };
@@ -38,14 +38,14 @@
089C165DFE840E0CC02AAC07 /* English */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = English; path = English.lproj/InfoPlist.strings; sourceTree = "<group>"; };
1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = /System/Library/Frameworks/Cocoa.framework; sourceTree = "<absolute>"; };
257572D5072881A4000BE9CA /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
257572D6072881A4000BE9CA /* ManagedSoftwareUpdate.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = ManagedSoftwareUpdate.app; sourceTree = BUILT_PRODUCTS_DIR; };
257572D6072881A4000BE9CA /* Managed Software Update.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "Managed Software Update.app"; sourceTree = BUILT_PRODUCTS_DIR; };
29B97316FDCFA39411CA2CEA /* main.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
29B97324FDCFA39411CA2CEA /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = /System/Library/Frameworks/AppKit.framework; sourceTree = "<absolute>"; };
29B97325FDCFA39411CA2CEA /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = /System/Library/Frameworks/Foundation.framework; sourceTree = "<absolute>"; };
60A014C30DBD2AA20071D9A8 /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = English.lproj/MainMenu.xib; sourceTree = "<group>"; };
65359356078DD41800E8BB2F /* AppleScriptKit.sdef */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.sdef; name = AppleScriptKit.sdef; path = /System/Library/Frameworks/AppleScriptKit.framework/Versions/A/Resources/AppleScriptKit.sdef; sourceTree = "<absolute>"; };
C09152A10FB51AE1006BC8DE /* Empty.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Empty.png; sourceTree = "<group>"; };
C09153050FB64FD1006BC8DE /* ManagedSoftwareUpdate.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = ManagedSoftwareUpdate.icns; sourceTree = "<group>"; };
C09153050FB64FD1006BC8DE /* Managed Software Update.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = "Managed Software Update.icns"; sourceTree = "<group>"; };
C0ACDA9A0FB4A386006D30B3 /* Installer.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; path = Installer.tiff; sourceTree = "<group>"; };
C0ACDA9F0FB4A386006D30B3 /* package.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; path = package.tiff; sourceTree = "<group>"; };
C0ACDAA00FB4A386006D30B3 /* Restart.tif */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; path = Restart.tif; sourceTree = "<group>"; };
@@ -96,7 +96,7 @@
19C28FACFE9D520D11CA2CBB /* Products */ = {
isa = PBXGroup;
children = (
257572D6072881A4000BE9CA /* ManagedSoftwareUpdate.app */,
257572D6072881A4000BE9CA /* Managed Software Update.app */,
);
name = Products;
sourceTree = "<group>";
@@ -125,7 +125,7 @@
29B97317FDCFA39411CA2CEA /* Resources */ = {
isa = PBXGroup;
children = (
C09153050FB64FD1006BC8DE /* ManagedSoftwareUpdate.icns */,
C09153050FB64FD1006BC8DE /* Managed Software Update.icns */,
C09152A10FB51AE1006BC8DE /* Empty.png */,
C0ACDA9A0FB4A386006D30B3 /* Installer.tiff */,
C0ACDA9F0FB4A386006D30B3 /* package.tiff */,
@@ -177,7 +177,7 @@
name = ManagedSoftwareUpdate;
productInstallPath = "$(HOME)/Applications";
productName = ManagedSoftwareUpdate;
productReference = 257572D6072881A4000BE9CA /* ManagedSoftwareUpdate.app */;
productReference = 257572D6072881A4000BE9CA /* Managed Software Update.app */;
productType = "com.apple.product-type.application";
};
/* End PBXNativeTarget section */
@@ -209,7 +209,7 @@
C0ACDAAD0FB4A387006D30B3 /* Restart.tif in Resources */,
C0ACDAB00FB4A387006D30B3 /* RestartReq.tif in Resources */,
C09152A20FB51AE1006BC8DE /* Empty.png in Resources */,
C09153060FB64FD1006BC8DE /* ManagedSoftwareUpdate.icns in Resources */,
C09153060FB64FD1006BC8DE /* Managed Software Update.icns in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -256,7 +256,7 @@
GCC_OPTIMIZATION_LEVEL = 0;
INFOPLIST_FILE = Info.plist;
INSTALL_PATH = "$(HOME)/Applications";
PRODUCT_NAME = ManagedSoftwareUpdate;
PRODUCT_NAME = "Managed Software Update";
WRAPPER_EXTENSION = app;
};
name = Debug;
@@ -269,7 +269,7 @@
INFOPLIST_FILE = Info.plist;
INSTALL_PATH = "$(HOME)/Applications";
OTHER_OSAFLAGS = "-x";
PRODUCT_NAME = ManagedSoftwareUpdate;
PRODUCT_NAME = "Managed Software Update";
WRAPPER_EXTENSION = app;
};
name = Release;