d5bb566e4b
Merge branch 'master' into NSURL
2014-10-23 15:17:48 -07:00
50b4418de8
Merge pull request #412 from bartreardon/master
...
fix preinstall_alert and preuninstall_alert unicode support
2014-10-23 15:17:19 -07:00
77879453f7
removed incorrect usage of NSLocalisedString
2014-10-24 09:12:04 +11:00
653eb85d29
Merge branch 'master' into NSURL
2014-10-23 14:56:49 -07:00
7bff4281dd
Adding uninstall description pkginfo key
2014-10-23 14:48:52 -07:00
4e79aa60a5
Merge branch 'master' into NSURL
2014-10-23 14:22:49 -07:00
6f8aa360d8
More explicit help string for items argument to iconimporter.
...
As per discussion in pull request #413 .
2014-10-23 15:41:48 -05:00
f670bcc1fd
More debugging output from munkilib/keychain.py
2014-10-23 13:38:41 -07:00
5878275821
Added options to restrict run to specified repo items.
2014-10-23 14:21:39 -05:00
4f7d74231d
fix preinstall_alert and preuninstall_alert unicode support
2014-10-23 15:38:21 +11:00
43de90f8b0
Remove keychain operations from appleupdates.py. We'll need to revisit this if people use client cert authentication against their Apple Software Update server
2014-10-22 17:04:45 -07:00
69fd00beeb
Rebuild the client keychain if the client cert or key is newer than the keychain
2014-10-22 14:33:38 -07:00
38ebbf79ec
Move more code from makekeychain to munkilib.keychain; attempt to build keychain on demand; should not need to run makekeychain at all
2014-10-22 11:59:32 -07:00
fa22d8aad7
Add CA certs as trusted to System keychain. When deriving the site_url from Munki's preferences, make sure it ends with a trailing slash
2014-10-21 14:55:28 -07:00
ba00e77654
Merge branch 'master' into NSURL
2014-10-20 15:52:12 -07:00
53edd6a050
Adjust munkitools distribution script so that launchd pkg is installed during an OS X install (for example as part of a NetInstall set or inside a createOSXinstallPkg package)
2014-10-20 15:50:27 -07:00
22e816010b
Bump version to 2.0.1
2014-10-17 08:17:05 -07:00
7fe7ada571
Spaces can be important!
2014-10-17 08:16:19 -07:00
78d2dabf58
Update make_munki_mpkg_from_git.sh to pull from GitHub
2014-10-17 08:13:12 -07:00
8c780d10b1
Add Yosemite SUS catalog to list of default catalogs.
2014-10-17 08:07:47 -07:00
e232c1b955
New attempt to use NSURLConnection + keychain to replace curl
2014-10-15 16:39:38 -07:00
42d2a211fb
Change order of file discovery to match original order.
2014-10-15 11:20:22 -04:00
d300f043a3
Refactoring getFlatPackageInfo - Only extract the Distribution file or PackageInfo file(s) instead of the entire package. Works around an issue with bad xar compression with certain flat packages.
2014-10-15 10:31:36 -04:00
f967727d63
Refactor getFlatPackageInfo to better deal with bad xar compression.
2014-10-14 16:17:48 -04:00
17a8cdc853
Merge pull request #395 from bartreardon/user_agreement
...
Add optional preinstall_alert key to pkginfo plist.
2014-10-07 08:55:32 -07:00
f1515eb8a1
Move 'Embed version info' phase to end in Xcode project
...
- fixes issue where, in Xcode 6, the template app plists were not yet
copied to the TARGET_BUILD_DIR during build
2014-10-07 10:29:23 -04:00
0b0a8c09af
Reverted to preinstall_alert and preuninstall_alert to keep in the scheme of other pkginfo keys
2014-10-07 22:01:34 +11:00
a7189c4d6a
added pre uninstall capability as well
2014-10-07 11:13:30 +11:00
91d06b8a3c
Revert "changes to allow MSC compile in xcode 6"
...
This reverts commit 13cd0d2caf
2014-10-03 21:34:48 +10:00
13cd0d2caf
changes to allow MSC compile in xcode 6
2014-10-03 20:51:34 +10:00
c77eed698c
changed pkginfo item from 'alert' to 'preinstall_alert'
...
moved preinstall alert code to it's own function (takes preinstall_alert dict as argument)
compliant use of NSLocalizedString so genstrings can do its thing
2014-10-03 07:34:58 +10:00
0363e721d6
Better support for alert with dict for specifying alert values.
2014-10-02 21:05:39 +10:00
0b4fe4e6d2
added more options for changing text, title and button text.
...
work in progress
2014-10-02 16:53:12 +10:00
5b9d9c445f
Revert "munkicommon: remove tmpdir at exit"
2014-10-01 06:33:25 -07:00
09928ecd8c
Added optional user_agreement key. Displays text that end users can agree or not before continuing with install
2014-10-01 21:58:26 +10:00
f90723554d
munkicommon: remove tmpdir at exit
...
Currently importing munkicommon has the side-effect of creating a temporary directory in /tmp and this temporary directory is never cleaned up. To fix this with as small a change as possible, register an atexit function to clean-up this directory when the importing script exits.
This won't clean-up the directory in the event that the importing script exits with sys._exit or an un-handled exception. The cleanup function could be changed to remove any directory matching /tmp/munki-* if that were desirable.
2014-09-30 13:04:54 -04:00
c76fc99d6d
Add entry to catch SwitchBoard.app in killStupidProcesses
...
The existing entry to kill off SwitchBoard.app being launched in the loginwindow context did not always work. Adding "/bin/bash /Library/Application Support/Adobe/SwitchBoard/SwitchBoard.app/Contents/MacOS/switchboard.sh" resolves this issue.
2014-09-26 12:55:47 -04:00
928683d76e
Fix for sidebar categories pop-up menu 'All Categories' item when localized to non-English
2014-09-26 06:10:29 -07:00
6ed8117801
Update project URL for About dialog and Get Info display
2014-09-25 17:16:12 -07:00
b04bc925ea
Fix for issue where ClientResourcesFilename preferences is ignored.
2014-09-25 07:09:59 -07:00
ac14ae82e3
Minor window tweaks
2014-09-23 11:13:19 -07:00
40e0f74fa5
makepkginfo: if -i/--item is specified, don't try to guess if a dmg contains an Adobe installer
2014-09-02 22:38:01 -07:00
2269fc864d
Explicitly enable/disable toolbar buttons when main window is activated/deactivated to better match appearance and behavior of App Store
2014-09-02 22:06:34 -07:00
f2d20f6316
Mass renaming of MSUfoo stuff to MSCfoo stuff. Hope I don't regret it.
2014-09-02 20:56:25 -07:00
1e7503d046
Add custom subclasses MSCToolbarButton and MSCToolbarButtonCell to allow clicking on toolbar item title.
2014-09-02 19:04:33 -07:00
72e171c75d
Fix .strings file formatting issue for nb.lproj/Localizable.strings
2014-09-01 06:44:06 -07:00
bf1dfeec61
Updated Norwegian Bokmal translation. Thanks to Frank Paul Silye.
2014-08-31 08:16:49 -07:00
a83e293dae
MunkiStatus: re-encode .strings files to UTF-8 to avoid build warnings
2014-08-30 08:17:41 -07:00
dd52ff4b83
Re-encode Localized.strings as UTF-8 to eliminate build warnings
2014-08-30 08:06:38 -07:00
38a800d4cb
Updated Swedish translation by Jonas Jöreskog
2014-08-28 12:56:53 -07:00
Greg Neagle