Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge branch 'COOK-584'

  • Loading branch information...
commit 4d7698e5877c61f41692d89d6ca64c275a7fe895 2 parents 6f1d8e6 + 0aa74ad
Seth Chisamore schisamo authored
29 dmg/README.md
View
@@ -1,23 +1,35 @@
Description
===========
-Lightweight resource and provider to install OS X applications (.app) from dmg files
+Lightweight resource and provider to install OS X applications (.app) from dmg files.
+
+Changes
+=======
+
+## v0.6.0:
+
+- option to install software that is an .mpkg inside a .dmg
+- ignore failure on chmod in case mode is already set, or is root owned
Requirements
============
-Platform: Mac OS X
+## Platform:
+
+* Mac OS X
Resources and Providers
=======================
-`dmg_package`
--------------
+dmg\_package
+------------
This resource will install a DMG "Package". It will retrieve the DMG from a remote URL, mount it using OS X's `hdid`, copy the application (.app directory) to the specified destination (/Applications), and detach the image using `hdiutil`. The dmg file will be stored in the `Chef::Config[:file_cache_path]`. If you want to install an application that has already been downloaded (not using the `source` parameter), copy it to the appropriate location. You can find out what directory this is with the following command on the node to run chef:
knife exec -E 'p Chef::Config[:file_cache_path]' -c /etc/chef/client.rb
+Optionally, the LWRP can install an "mpkg" package using installer(8).
+
# Actions:
* :install - Installs the application.
@@ -28,6 +40,7 @@ This resource will install a DMG "Package". It will retrieve the DMG from a remo
* `source` - remote URL for the dmg to download if specified. Default is nil.
* `destination` - directory to copy the .app into. Default is /Applications.
* `checksum` - sha256 checksum of the dmg to download. Default is nil.
+* `type` - type of package, "app" or "mpkg". Default is "app". When using "mpkg", the destination must be /Applications.
* `volumes_dir` - Directory under /Volumes where the dmg is mounted. Not all dmgs are mounted into a /Volumes location matching the name of the dmg. If not specified, this will use the name attribute.
* `dmg_name` - Specify the name of the dmg if it is not the same as `app`, or if the name has spaces.
@@ -69,6 +82,13 @@ Install MacIrssi to `~/Applications` from the local file downloaded to the cache
action :install
end
+Install Virtualbox to `/Applications` from the .mpkg:
+
+ dmg_package "Virtualbox" do
+ source "http://dlc.sun.com.edgesuite.net/virtualbox/4.0.8/VirtualBox-4.0.8-71778-OSX.dmg"
+ type "mpkg"
+ end
+
To do
=====
@@ -82,7 +102,6 @@ Some things that would be nice to have at some point.
* use hdiutil to mount/attach the disk image
* automatically detect the `volumes_dir` where the image is attached
* be able to automatically accept license agreements
-* install software that is a .pkg inside a .dmg instead of just .app's
License and Author
==================
32 dmg/metadata.json
View
@@ -1,32 +0,0 @@
-{
- "name": "dmg",
- "description": "LWRP to install OS X applications from dmgs",
- "long_description": "Description\n===========\n\nLightweight resource and provider to install OS X applications (.app) from dmg files\n\nRequirements\n============\n\nPlatform: Mac OS X\n\nResources and Providers\n=======================\n\n`dmg_package`\n-------------\n\nThis resource will install a DMG \"Package\". It will retrieve the DMG from a remote URL, mount it using OS X's `hdid`, copy the application (.app directory) to the specified destination (/Applications), and detach the image using `hdiutil`. The dmg file will be stored in the `Chef::Config[:file_cache_path]`. If you want to install an application that has already been downloaded (not using the `source` parameter), copy it to the appropriate location. You can find out what directory this is with the following command on the node to run chef:\n\n knife exec -E 'p Chef::Config[:file_cache_path]' -c /etc/chef/client.rb\n\n# Actions:\n\n* :install - Installs the application.\n\n# Parameter attributes:\n\n* `app` - This is the name of the application used by default for the /Volumes directory and the .app directory copied to /Applications.\n* `source` - remote URL for the dmg to download if specified. Default is nil.\n* `destination` - directory to copy the .app into. Default is /Applications.\n* `checksum` - sha256 checksum of the dmg to download. Default is nil.\n* `volumes_dir` - Directory under /Volumes where the dmg is mounted. Not all dmgs are mounted into a /Volumes location matching the name of the dmg. If not specified, this will use the name attribute.\n* `dmg_name` - Specify the name of the dmg if it is not the same as `app`, or if the name has spaces.\n\nUsage Examples\n==============\n\nInstall `/Applications/Tunnelblick.app` from the primary download site.\n\n dmg_package \"Tunnelblick\" do\n source \"http://tunnelblick.googlecode.com/files/Tunnelblick_3.1.2.dmg\"\n checksum \"a3fae60b6833175f32df20c90cd3a3603a\"\n action :install\n end\n\nInstall Google Chrome. Uses the `dmg_name` because the application name has spaces. Installs in `/Applications/Google Chrome.app`.\n\n dmg_package \"Google Chrome\" do\n dmg_name \"googlechrome\"\n source \"https://dl-ssl.google.com/chrome/mac/stable/GGRM/googlechrome.dmg\"\n checksum \"7daa2dc5c46d9bfb14f1d7ff4b33884325e5e63e694810adc58f14795165c91a\"\n action :install\n end\n\nInstall Dropbox. Uses `volumes_dir` because the mounted directory is different than the name of the application directory. Installs in `/Applications/Dropbox.app`.\n\n dmg_package \"Dropbox\" do\n volumes_dir \"Dropbox Installer\"\n source \"http://www.dropbox.com/download?plat=mac\"\n checksum \"b4ea620ca22b0517b75753283ceb82326aca8bc3c86212fbf725de6446a96a13\"\n action :install\n end\n\nInstall MacIrssi to `~/Applications` from the local file downloaded to the cache path into an Applications directory in the current user's home directory. Chef should run as a non-root user for this.\n\n directory \"#{ENV['HOME']}/Applications\"\n\n dmg_package \"MacIrssi\" do\n destination \"#{ENV['HOME']}/Applications\"\n action :install\n end\n\nTo do\n=====\n\nA few things remain outstanding to make this cookbook \"1.0\" quality.\n\n* support downloading a .dmg.zip and unzipping it\n* specify a local .dmg already downloaded in another location (like ~/Downloads)\n\nSome things that would be nice to have at some point.\n\n* use hdiutil to mount/attach the disk image\n* automatically detect the `volumes_dir` where the image is attached\n* be able to automatically accept license agreements\n* install software that is a .pkg inside a .dmg instead of just .app's\n\nLicense and Author\n==================\n\n* Copyright 2011, Joshua Timberman <cookbooks@housepub.org>\n\nLicensed under the Apache License, Version 2.0 (the \"License\");\nyou may not use this file except in compliance with the License.\nYou may obtain a copy of the License at\n\n http://www.apache.org/licenses/LICENSE-2.0\n\nUnless required by applicable law or agreed to in writing, software\ndistributed under the License is distributed on an \"AS IS\" BASIS,\nWITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\nSee the License for the specific language governing permissions and\n",
- "maintainer": "Joshua Timberman",
- "maintainer_email": "cookbooks@housepub.org",
- "license": "Apache 2.0",
- "platforms": {
- "mac_os_x": [
-
- ]
- },
- "dependencies": {
- },
- "recommendations": {
- },
- "suggestions": {
- },
- "conflicting": {
- },
- "providing": {
- },
- "replacing": {
- },
- "attributes": {
- },
- "groupings": {
- },
- "recipes": {
- },
- "version": "0.5.2"
-}
2  dmg/metadata.rb
View
@@ -3,5 +3,5 @@
license "Apache 2.0"
description "LWRP to install OS X applications from dmgs"
long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
-version "0.5.2"
+version "0.6.0"
supports "mac_os_x"
9 dmg/providers/package.rb
View
@@ -43,11 +43,18 @@ def load_current_resource
not_if "hdiutil info | grep -q 'image-path.*#{dmg_file}'"
end
- execute "cp -r '/Volumes/#{volumes_dir}/#{new_resource.app}.app' '#{new_resource.destination}'"
+ case new_resource.type
+ when "app"
+ execute "cp -r '/Volumes/#{volumes_dir}/#{new_resource.app}.app' '#{new_resource.destination}'"
+ when "mpkg"
+ execute "sudo installer -pkg /Volumes/#{volumes_dir}/#{new_resource.app}.mpkg -target /"
+ end
+
execute "hdiutil detach '/Volumes/#{volumes_dir}'"
file "#{new_resource.destination}/#{new_resource.app}.app/Contents/MacOS/#{new_resource.app}" do
mode 0755
+ ignore_failure true
end
end
1  dmg/resources/package.rb
View
@@ -24,6 +24,7 @@
attribute :checksum, :kind_of => String, :default => nil
attribute :volumes_dir, :kind_of => String, :default => nil
attribute :dmg_name, :kind_of => String, :default => nil
+attribute :type, :kind_of => String, :default => "app"
attribute :installed, :kind_of => [TrueClass, FalseClass], :default => false
def initialize(name, run_context=nil)
Please sign in to comment.
Something went wrong with that request. Please try again.