Permalink
Browse files

add support for EULA resource fork

  • Loading branch information...
1 parent ea5f4fc commit c532c59fce70b85e77ff07f355654f2ec990221e @wesen wesen committed Jan 3, 2013
Showing with 148 additions and 11 deletions.
  1. +7 −11 create-dmg
  2. +141 −0 support/dmg-license.py
View
@@ -1,13 +1,6 @@
#! /bin/bash
# Create a read-only disk image of the contents of a folder
-#
-# Usage: make-diskimage <image_file>
-# <src_folder>
-# <volume_name>
-# <applescript>
-# <artpath>
-# <eula_resource_file>
set -e;
@@ -45,6 +38,8 @@ function usage() {
echo " set position and custom icon"
echo " --app-drop-link x y"
echo " make a drop link to Applications, at location x,y"
+ echo " --eula eula_file"
+ echo " attach a license file to the dmg"
echo " --version show tool version number"
echo " -h, --help display this help"
exit 0
@@ -98,6 +93,9 @@ while test "${1:0:1}" = "-"; do
APPLICATION_CLAUSE="set position of item \"Applications\" to {$2, $3}
"
shift; shift; shift;;
+ --eula)
+ EULA_RSRC=$2
+ shift; shift;;
-*)
echo "Unknown option $1. Run with --help for help."
exit 1;;
@@ -117,7 +115,7 @@ DMG_TEMP_NAME="$DMG_DIR/rw.${DMG_NAME}"
SRC_FOLDER="$(cd "$2" > /dev/null; pwd)"
test -z "$VOLUME_NAME" && VOLUME_NAME="$(basename "$DMG_PATH" .dmg)"
-AUX_PATH="$(cd "$(dirname $0)"; pwd)/support"
+AUX_PATH="$(dirname $(readlink $0))/support"
@dejuknow

dejuknow Jan 8, 2013

Using readlink here breaks the script.

According to man, "When invoked as readlink, only the target of the symbolic link is printed. If the given argument is not a symbolic link, readlink will print nothing and exit with an error.".

Since $0 (create-dmg) is not a symlink, nothing is printed, thus line 118 of the script is interpreted as:
AUX_PATH="$(dirname)/support"

which results in the error output: "usage: dirname path"

@wesen

wesen Jan 8, 2013

Contributor

yep, I switched this to greadlink, which works in a more sensible way. Andrey has a small ruby oneliner that does the same thing.

test -d "$AUX_PATH" || {
echo "Cannot find support directory: $AUX_PATH"
@@ -199,9 +197,7 @@ rm -f "${DMG_TEMP_NAME}"
# adding EULA resources
if [ ! -z "${EULA_RSRC}" -a "${EULA_RSRC}" != "-null-" ]; then
echo "adding EULA resources"
- hdiutil unflatten "${DMG_DIR}/${DMG_NAME}"
- /Developer/Tools/ResMerger -a "${EULA_RSRC}" -o "${DMG_DIR}/${DMG_NAME}"
- hdiutil flatten "${DMG_DIR}/${DMG_NAME}"
+ "${AUX_PATH}/dmg-license.py" "${DMG_DIR}/${DMG_NAME}" "${EULA_RSRC}"
fi
echo "Disk image done"
View
@@ -0,0 +1,141 @@
+#! /usr/bin/env python
+"""
+This script adds a license file to a DMG. Requires Xcode and a plain ascii text
+license file.
+Obviously only runs on a Mac.
+
+Copyright (C) 2011 Jared Hobbs
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+"""
+import os
+import sys
+import tempfile
+import optparse
+
+
+class Path(str):
+ def __enter__(self):
+ return self
+
+ def __exit__(self, type, value, traceback):
+ os.unlink(self)
+
+
+def mktemp(dir=None, suffix=''):
+ (fd, filename) = tempfile.mkstemp(dir=dir, suffix=suffix)
+ os.close(fd)
+ return Path(filename)
+
+
+def main(options, args):
+ dmgFile, license = args
+ with mktemp('.') as tmpFile:
+ with open(tmpFile, 'w') as f:
+ f.write("""data 'LPic' (5000) {
+ $"0002 0011 0003 0001 0000 0000 0002 0000"
+ $"0000 000E 0006 0001 0005 0007 0000 0007"
+ $"0008 0000 0047 0009 0000 0034 000A 0001"
+ $"0035 000B 0001 0020 000C 0000 0011 000D"
+ $"0000 005B 0004 0000 0033 000F 0001 000C"
+ $"0010 0000 000B 000E 0000"
+};\n\n""")
+ with open(license, 'r') as l:
+ f.write('data \'TEXT\' (5002, "English") {\n')
+ for line in l:
+ if len(line) < 1000:
+ f.write(' "' + line.strip().replace('"', '\\"') +
+ '\\n"\n')
+ else:
+ for liner in line.split('.'):
+ f.write(' "' +
+ liner.strip().replace('"', '\\"') +
+ '. \\n"\n')
+ f.write('};\n\n')
+ f.write("""resource 'STR#' (5002, "English") {
+ {
+ "English",
+ "Agree",
+ "Disagree",
+ "Print",
+ "Save...",
+ "IMPORTANT - By clicking on the \\"Agree\\" button, you agree "
+ "to be bound by the terms of the License Agreement.",
+ "Software License Agreement",
+ "This text cannot be saved. This disk may be full or locked, or the "
+ "file may be locked.",
+ "Unable to print. Make sure you have selected a printer."
+ }
+};""")
+ os.system('/usr/bin/hdiutil unflatten -quiet "%s"' % dmgFile)
+ os.system('%s "%s/"*.r %s -a -o "%s"' %
+ (options.rez, options.flat_carbon, tmpFile, dmgFile))
+
+ os.system('/usr/bin/hdiutil flatten -quiet "%s"' % dmgFile)
+ if options.compression is not None:
+ os.system('cp %s %s.temp.dmg' % (dmgFile, dmgFile))
+ os.remove(dmgFile)
+ if options.compression == "bz2":
+ os.system('hdiutil convert %s.temp.dmg -format UDBZ -o %s' %
+ (dmgFile, dmgFile))
+ elif options.compression == "gz":
+ os.system('hdiutil convert %s.temp.dmg -format ' % dmgFile +
+ 'UDZO -imagekey zlib-devel=9 -o %s' % dmgFile)
+ os.remove('%s.temp.dmg' % dmgFile)
+ print "Successfully added license to '%s'" % dmgFile
+
+if __name__ == '__main__':
+ parser = optparse.OptionParser()
+ parser.set_usage("""%prog <dmgFile> <licenseFile> [OPTIONS]
+ This program adds a software license agreement to a DMG file.
+ It requires Xcode and a plain ascii text <licenseFile>.
+
+ See --help for more details.""")
+ parser.add_option(
+ '--rez',
+ '-r',
+ action='store',
+ default='/Applications/Xcode.app/Contents/Developer/Tools/Rez',
+ help='The path to the Rez tool. Defaults to %default'
+ )
+ parser.add_option(
+ '--flat-carbon',
+ '-f',
+ action='store',
+ default='/Applications/Xcode.app/Contents/Developer/Platforms'
+ '/MacOSX.platform/Developer/SDKs/MacOSX10.7.sdk'
+ '/Developer/Headers/FlatCarbon',
+ help='The path to the FlatCarbon headers. Defaults to %default'
+ )
+ parser.add_option(
+ '--compression',
+ '-c',
+ action='store',
+ choices=['bz2', 'gz'],
+ default=None,
+ help='Optionally compress dmg using specified compression type. '
+ 'Choices are bz2 and gz.'
+ )
+ options, args = parser.parse_args()
+ cond = len(args) != 2 or not os.path.exists(options.rez) \
+ or not os.path.exists(options.flat_carbon)
+ if cond:
+ parser.print_usage()
+ sys.exit(1)
+ main(options, args)

0 comments on commit c532c59

Please sign in to comment.