Commit Graph

104 Commits

Author SHA1 Message Date
Greg Neagle
53d2b0b5be At long last, munkiimport prompts for values for unattended_install and unattended_uninstall. 2016-03-30 09:49:00 -07:00
Greg Neagle
12d4f0d27e Update copyright info on files; remove abandoned tools from code/tools 2016-03-15 09:32:28 -07:00
Greg Neagle
37276f5307 Better determination when munkiimport item is an apple_update_metadata item; fixes bug where 'munkiimport --apple-item' worked but 'munkiimport --apple_item' failed, despite makepkginfo --help indicating both syntaxes should work. 2015-12-02 10:54:43 -08:00
Samuel Keeley
5c12185da4 Replace http://www.apache.org/licenses/LICENSE-2.0 with https://www.apache.org/licenses/LICENSE-2.0 2015-11-13 20:35:24 -08:00
Greg Neagle
41de516720 PyLint cleanup 2015-10-23 10:10:26 -07:00
Greg Neagle
cc794c9c39 Merge pull request #532 from munki/samuel-munkiimport
Don't offer to create icons for profiles or Apple metadata
2015-10-23 10:05:47 -07:00
Samuel Keeley
e0f771ceda Don't offer to create icons for profiles or Apple metadata 2015-10-23 10:02:47 -07:00
Shea Craig
ae9cd75dc9 Add mobileconfig to the usage of munkiimport. 2015-10-23 11:32:31 -04:00
Greg Neagle
853fcfdb23 PyLint cleanups on munkiimport 2015-08-12 14:21:14 -07:00
Greg Neagle
416edbc2dc Fix issue when matching receipts when an individual receipts's version number is different from the overall item version number 2015-08-12 13:00:24 -07:00
Greg Neagle
ba387f2b7c Convert all command-line arguments to Unicode (assuming utf-8 encoding) to eliminate issues with item paths containing Unicode characters 2015-03-13 12:20:20 -07:00
Greg Neagle
c88ce43b65 Don't warn about no receipts or installs array for pkginfo for profiles 2015-01-20 21:34:46 -08:00
Arjen van Bochoven
c3577c210a Added support for icon_hash to munkiimport 2015-01-19 22:49:57 +01:00
Greg Neagle
a4a0d9d544 Merge config-profile-support into master 2015-01-13 06:55:24 -08:00
Greg Neagle
58d8a07dec Clean up the tmpdir on exit of iconimporter, makepkginfo and munkiimport 2015-01-09 15:08:52 -08:00
Greg Neagle
83fabfb5ce Add support for importing, installing and removing configuration profiles. 2014-12-16 21:57:41 -08:00
Greg Neagle
cacb4524fa Merge pull request #415 from jlrgraham/munkiimport_icon
munkiimport: Add argument to specify package icon
2014-12-01 21:43:10 -08:00
Greg Neagle
1f058ffdc3 Don't check installeritem path if we are importing an Apple metadata item. 2014-11-24 19:20:12 -08:00
Greg Neagle
a6955fd0d4 Initial explict support for Adobe CCP packages. Use to import a CCP installer and uninstaller. 2014-11-03 14:01:20 -08:00
Greg Neagle
423ec8b790 PyLint cleanup: replace all unused_foo variables with dummy_foo variables to make PyLint happy 2014-10-26 11:42:33 -07:00
Greg Neagle
564e4ac368 Change munkicommon.tmpdir to a function so that importing munkicommon does not create orphaned munki-foo directories in /tmp 2014-10-25 10:06:37 -07:00
Justin L R Graham
5cf8319705 Added command line option to specify an icon file. 2014-10-23 23:41:10 -05:00
Justin L R Graham
ce199f9b9d Move common icon installation code to a function. 2014-10-23 23:40:32 -05:00
Greg Neagle
3a23ad2607 Fix for unhandled exception when extracting an icon when munkiimport is called with the -p option 2014-08-01 13:22:18 -07:00
Greg Neagle
143b8af942 Remove trailing whitespace from all lines in munkiimport (code style issue) 2014-07-22 10:18:18 -07:00
Greg Neagle
861a6a3d9d Add missing module name in munkiimport's generate_pngs_from_installer_pkg; fixes a crash when extracting an icon from a pkg item 2014-06-24 14:05:00 -07:00
Greg Neagle
b390c7f46f munkiimport now offers to extract and upload product icons 2014-05-21 16:15:38 -07:00
Greg Neagle
77785f589a Remove prompt for icon_name on import; this often leads to undesireable results. 2014-03-25 09:02:06 -07:00
Greg Neagle
64593614de Add support for category, developer and icon_name to munkiimport 2014-03-03 10:38:47 -08:00
Greg Neagle
fddd138000 Bumping version to 1.0.0. Updated copyright dates. 2014-01-10 08:20:15 -08:00
Hannes Juutilainen
ae71171d70 Merge branch 'master' into development
* master:
  More localization fixes.
  Localization fix for the message: 'A restart is required after updating. Please be patient as there may be a short delay at the login window. Log out and update now?'
  Updated Swedish localization by peter.wreiber@gmail.com
  Track whether an update was installed in "only_unattended" mode or not in InstallResults, for additional reporting on various Munki servers.
  updated spanish strings for consistency
  Change application data collection code so that system_profiler SPApplicationsDataType is called only once per Munki session, even if system_profiler fails or hangs.
  Remove -d option from munkiimport as it conflicts with -d option to makepkginfo
  Don't display 'Running installcheck_script/uninstallcheck_script for foo...' messages when checking for updates.
  Support for installing AAMEE/CCP packages that include updates.
  Fix "NameError: name 'report_broken_python' is not defined" crash when attempting to report a broken Python install. The file hasn't been parsed at this point, so the report_broken_python function is nonexistent.
  Fix case where munkicommon.getAppBundleExecutable() returns None due to non-existent Info.plist, causing Munki to crash when parsing the None executable name.
  Patch to adobeutils.py from Pepijn Bruienne <bruienne@gmail.com> to allow makepkginfo to properly parse an Adobe Creative Cloud product package built with Creative Cloud Packager.
  Fix typo in French localization.
  Updated French localization from Richard Lafontaine <iceman.grrrr@gmail.com>
  Add Swedish localization from Peter Wreiber <peter.wreiber@gmail.com>
  minor correction to the spanish translation
2013-06-18 09:16:40 +03:00
Greg Neagle
2422aa7f10 Remove -d option from munkiimport as it conflicts with -d option to makepkginfo 2013-05-31 16:00:46 -07:00
Hannes Juutilainen
df9e9202fb Merge branch 'master' into development
* master:
  Fix makepkginfo --force_install_after_date to create a date object for the pkginfo plist instead of a string.
  If a force_install_after_date install is near/past it's due date, logouthelper should be started (the machine should be forcefully rebooted) even if someone is logged in but the session is at the loginwindow (fast user switching).  Force should not be "force unless x, y, z".
  Add --repo_path and --repo_url options to munkiimport to allow the user to override the default repo_path and repo_url options set via munkiimport --configure at runtime
  If we are about to do an install at the loginwindow, check to see if FileSyncAgent.app is running. This might be HomeSync running during a login process. If so, don't install.
  Change apple_item logic in updatecheck.processRemoval to match that in updatecheck.processInstall. Specifically, allow admin to override detection of apple_item by explictly setting it in the pkginfo.
  Update version.plist to 0.9.0 for next development round.
2013-05-03 08:22:33 +03:00
Adam Reed
00e6afc33c Add --repo_path and --repo_url options to munkiimport to allow the user to override the default repo_path and repo_url options set via munkiimport --configure at runtime 2013-04-18 21:10:01 +10:00
Hannes Juutilainen
8ca86a0d1c Added support for volume mount points
Munkiimport can now take volume mount points as arguments
(/Volumes/SomeApp/) and resolve them to a disk image file.
2013-03-14 15:16:53 +02:00
Greg Neagle
0bb162dbfc Some Unicode/UTF-8 fixes for munkiimport. 2013-03-12 11:03:06 -07:00
Greg Neagle
cce11a4fc0 Better error checking when processing receipts and installs items when building our catalogDB; pylint cleanups 2013-03-08 14:14:38 -08:00
Greg Neagle
dbca31a486 Fix dumb copy-and-paste error in last commit that caused munkiimport to crash with NameError: global name 'item_version' is not defined 2013-03-06 21:42:44 -08:00
Greg Neagle
45de2d3b21 Changes to munkiimport: 1) Always append version number to uploaded dmg or pkg if not there originally; code clean up around the renaming. 2013-03-06 16:41:16 -08:00
Greg Neagle
98de6685cc Merge of https://code.google.com/r/theheig-conditionals/ apple-update-metadata: Adds support for Munki-style metadata to Apple updates. 2013-02-19 17:09:40 -08:00
Heig Gregorian
b55c1c30af Minor message and comment update
Comment regarding limitations to installing Apple updates removed from
managedsoftwareupdate.  Warning message regarding missing
'installs/receipts' on import of an '--apple-update' item is not
displayed.
2013-02-16 13:20:25 -08:00
Greg Neagle
731a470cbe Remove hack that allowed in-place editing of suggested/default values for prompts; does not work properly on remote sessions. 2013-02-12 13:42:10 -08:00
Heig Gregorian
e25b5aacf7 Merged with munki master; manually resolved 'munkiimport' merge conflicts 2013-02-12 10:00:12 -08:00
Greg Neagle
9f7a818edc Add new munkiimport preference for default catalog to use when no catalog is specified at the command line. Defaults to 'testing'. 2013-02-11 21:46:12 -08:00
Heig Gregorian
d92127c241 Initial commit for new installer_type 'apple-update-metadata'
Using the new '--apple-update' option available in makepkginfo (and
therefore munkiimport), an admin can generate metadata pkginfo files
for Apple updates.  Supported metadata keys will modify munki's
behavior of the specified Apple update offered to the client.  Examples
would include 'force_install_after_date' and 'RestartAction'.  The
'makecatalogs' utility has also been updated to allow for this new
installer_type when creating catalogs.

NOTE: Client-side implementation is not included in this commit.  This
commit only deals with the creation of these specialized pkginfo files.
2013-02-06 13:53:43 -08:00
Greg Neagle
954dfe9934 Use readline and a OS X hack to allow editable default values when importing an item. 2013-01-28 13:58:16 -08:00
Greg Neagle
4b71ace130 Updated copyright info on all files with copyright info. 2013-01-28 11:55:09 -08:00
Greg Neagle
78810f67fc Address issue 214: munkiimport should not crash when editor is missing. Print an error message and continue. 2013-01-28 11:40:54 -08:00
Timothy Sutton
6e6b050a37 fix for munkiimport only checking dmgs and apps - should check hasValidInstallerItemExt() 2012-07-11 15:25:25 -04:00
Timothy Sutton
93ca31bd3b Further refactoring for hasValid extension check functions
- hasValidPackageExt(), hasValidDiskImageExt() for the appropriate
  extensions, and hasValidInstallerItemExt() to call them
- replace many checks to use the above
- munkiimport.py now uses munkicommon.isApplication() to do the
  equivalent of checking endswith('.app')
- fix an errand merge ancestor from an old unrelated munkiimport
  branch
2012-07-11 13:56:23 -04:00