|
|
@@ -6,7 +6,8 @@
|
|
|
# Create a read-only disk image of the contents of a folder
|
|
|
# forked from https://github.com/andreyvit/create-dmg
|
|
|
|
|
|
-set -eux;
|
|
|
+# Bail out on any unhandled errors
|
|
|
+set -ex;
|
|
|
|
|
|
function pure_version() {
|
|
|
echo '1.0.0.6'
|
|
|
@@ -19,8 +20,8 @@ function version() {
|
|
|
function usage() {
|
|
|
version
|
|
|
echo "Creates a fancy DMG file."
|
|
|
- echo "Usage: $(basename $0) [options] <output_name.dmg> <source_folder>"
|
|
|
- echo "All contents of source_folder will be copied into the disk image."
|
|
|
+ echo "Usage: $(basename "$0") [options] <output_name.dmg> <source_folder>"
|
|
|
+ echo "All contents of <source_folder> will be copied into the disk image."
|
|
|
echo "Options:"
|
|
|
echo " --volname name"
|
|
|
echo " set volume name (displayed in the Finder sidebar and window title)"
|
|
|
@@ -40,8 +41,6 @@ function usage() {
|
|
|
echo " set position of the file's icon"
|
|
|
echo " --hide-extension file_name"
|
|
|
echo " hide the extension of file"
|
|
|
- echo " --custom-icon file_name custom_icon_or_sample_file x y"
|
|
|
- echo " set position and custom icon"
|
|
|
echo " --app-drop-link x y"
|
|
|
echo " make a drop link to Applications, at location x,y"
|
|
|
echo " --ql-drop-link x y"
|
|
|
@@ -61,9 +60,7 @@ function usage() {
|
|
|
echo " --hdiutil-quiet"
|
|
|
echo " execute hdiutil in quiet mode"
|
|
|
echo " --sandbox-safe"
|
|
|
- echo " execute hdiutil with sandbox compatibility and do not bless"
|
|
|
- echo " --rez rez_path"
|
|
|
- echo " use custom path to Rez tool"
|
|
|
+ echo " execute hdiutil with sandbox compatibility, do not bless and do not execute the cosmetic AppleScript"
|
|
|
echo " --version show tool version number"
|
|
|
echo " -h, --help display this help"
|
|
|
exit 0
|
|
|
@@ -82,10 +79,11 @@ IMAGEKEY=""
|
|
|
HDIUTIL_VERBOSITY=""
|
|
|
SANDBOX_SAFE=0
|
|
|
SKIP_JENKINS=0
|
|
|
+MAXIMUM_UNMOUNTING_ATTEMPTS=3
|
|
|
POSITION_CLAUSE=""
|
|
|
HIDING_CLAUSE=""
|
|
|
|
|
|
-while [ ! -z ${1+x} ] && test "${1:0:1}" = "-"; do
|
|
|
+while [[ "${1:0:1}" = "-" ]]; do
|
|
|
case $1 in
|
|
|
--volname)
|
|
|
VOLUME_NAME="$2"
|
|
|
@@ -95,7 +93,7 @@ while [ ! -z ${1+x} ] && test "${1:0:1}" = "-"; do
|
|
|
shift; shift;;
|
|
|
--background)
|
|
|
BACKGROUND_FILE="$2"
|
|
|
- BACKGROUND_FILE_NAME="$(basename $BACKGROUND_FILE)"
|
|
|
+ BACKGROUND_FILE_NAME="$(basename "$BACKGROUND_FILE")"
|
|
|
BACKGROUND_CLAUSE="set background picture of opts to file \".background:$BACKGROUND_FILE_NAME\""
|
|
|
REPOSITION_HIDDEN_FILES_CLAUSE="set position of every item to {theBottomRightX + 100, 100}"
|
|
|
shift; shift;;
|
|
|
@@ -119,8 +117,6 @@ while [ ! -z ${1+x} ] && test "${1:0:1}" = "-"; do
|
|
|
HIDING_CLAUSE="${HIDING_CLAUSE}set the extension hidden of item \"$2\" to true
|
|
|
"
|
|
|
shift; shift;;
|
|
|
- --custom-icon)
|
|
|
- shift; shift; shift; shift; shift;;
|
|
|
-h | --help)
|
|
|
usage;;
|
|
|
--version)
|
|
|
@@ -165,14 +161,11 @@ while [ ! -z ${1+x} ] && test "${1:0:1}" = "-"; do
|
|
|
--sandbox-safe)
|
|
|
SANDBOX_SAFE=1
|
|
|
shift;;
|
|
|
- --rez)
|
|
|
- REZ_PATH=$2
|
|
|
- shift; shift;;
|
|
|
--skip-jenkins)
|
|
|
SKIP_JENKINS=1
|
|
|
shift;;
|
|
|
-*)
|
|
|
- echo "Unknown option $1. Run with --help for help."
|
|
|
+ echo "Unknown option: $1. Run with --help for help."
|
|
|
exit 1;;
|
|
|
esac
|
|
|
case $FORMAT in
|
|
|
@@ -183,10 +176,10 @@ while [ ! -z ${1+x} ] && test "${1:0:1}" = "-"; do
|
|
|
esac
|
|
|
done
|
|
|
|
|
|
-[ -z ${2+x} ] && {
|
|
|
+if [[ -z "$2" ]]; then
|
|
|
echo "Not enough arguments. Invoke with --help for help."
|
|
|
exit 1
|
|
|
-}
|
|
|
+fi
|
|
|
|
|
|
SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
|
|
|
DMG_PATH="$1"
|
|
|
@@ -196,7 +189,16 @@ DMG_NAME="$(basename "$DMG_PATH")"
|
|
|
DMG_TEMP_NAME="$DMG_DIR/rw.${DMG_NAME}"
|
|
|
SRC_FOLDER="$(cd "$2" > /dev/null; pwd)"
|
|
|
|
|
|
-[ -z ${VOLUME_NAME+x} ] && VOLUME_NAME="$(basename "$DMG_PATH" .dmg)"
|
|
|
+# Argument validation checks
|
|
|
+
|
|
|
+if [[ "${DMG_PATH: -4}" != ".dmg" ]]; then
|
|
|
+ echo "Output file name must end with a .dmg extension. Run 'create-dmg --help' for help."
|
|
|
+ exit 1
|
|
|
+fi
|
|
|
+
|
|
|
+if [[ -z "$VOLUME_NAME" ]]; then
|
|
|
+ VOLUME_NAME="$(basename "$DMG_PATH" .dmg)"
|
|
|
+fi
|
|
|
|
|
|
# brew formula will set this as 1 and embed the support scripts
|
|
|
BREW_INSTALL=0
|
|
|
@@ -210,14 +212,16 @@ if [ $BREW_INSTALL -eq 0 ]; then
|
|
|
}
|
|
|
fi
|
|
|
|
|
|
-if [ -f "$SRC_FOLDER/.DS_Store" ]; then
|
|
|
+if [[ -f "$SRC_FOLDER/.DS_Store" ]]; then
|
|
|
echo "Deleting any .DS_Store in source folder"
|
|
|
rm "$SRC_FOLDER/.DS_Store"
|
|
|
fi
|
|
|
|
|
|
# Create the image
|
|
|
echo "Creating disk image..."
|
|
|
-test -f "${DMG_TEMP_NAME}" && rm -f "${DMG_TEMP_NAME}"
|
|
|
+if [[ -f "${DMG_TEMP_NAME}" ]]; then
|
|
|
+ rm -f "${DMG_TEMP_NAME}"
|
|
|
+fi
|
|
|
|
|
|
# Using Megabytes since hdiutil fails with very large Byte numbers
|
|
|
function blocks_to_megabytes() {
|
|
|
@@ -228,13 +232,13 @@ function blocks_to_megabytes() {
|
|
|
|
|
|
function get_size() {
|
|
|
# Get block size in disk
|
|
|
- bytes_size=`du -s "$1" | sed -e 's/ .*//g'`
|
|
|
- echo `blocks_to_megabytes $bytes_size`
|
|
|
+ bytes_size=$(du -s "$1" | sed -e 's/ .*//g')
|
|
|
+ echo $(blocks_to_megabytes "$bytes_size")
|
|
|
}
|
|
|
|
|
|
# Create the DMG with the specified size or the hdiutil estimation
|
|
|
CUSTOM_SIZE=''
|
|
|
-if [ ! -z ${DISK_IMAGE_SIZE+x} ]; then
|
|
|
+if [[ -n "$DISK_IMAGE_SIZE" ]]; then
|
|
|
CUSTOM_SIZE="-size ${DISK_IMAGE_SIZE}m"
|
|
|
fi
|
|
|
|
|
|
@@ -247,18 +251,17 @@ else
|
|
|
fi
|
|
|
|
|
|
# Get the created DMG actual size
|
|
|
-DISK_IMAGE_SIZE=`get_size "${DMG_TEMP_NAME}"`
|
|
|
+DISK_IMAGE_SIZE=$(get_size "${DMG_TEMP_NAME}")
|
|
|
|
|
|
# Use the custom size if bigger
|
|
|
-if [ $SANDBOX_SAFE -eq 1 ] && [ ! -z ${DISK_IMAGE_SIZE_CUSTOM+x} ] && [ $DISK_IMAGE_SIZE_CUSTOM -gt $DISK_IMAGE_SIZE ]; then
|
|
|
+if [[ $SANDBOX_SAFE -eq 1 ]] && [[ -n "$DISK_IMAGE_SIZE_CUSTOM" ]] && [[ $DISK_IMAGE_SIZE_CUSTOM -gt $DISK_IMAGE_SIZE ]]; then
|
|
|
DISK_IMAGE_SIZE=$DISK_IMAGE_SIZE_CUSTOM
|
|
|
fi
|
|
|
|
|
|
-# Estimate the additional soruces size
|
|
|
-if [ ! -z ${ADD_FILE_SOURCES+x} ]; then
|
|
|
- for i in "${!ADD_FILE_SOURCES[@]}"
|
|
|
- do
|
|
|
- SOURCE_SIZE=`get_size "${ADD_FILE_SOURCES[$i]}"`
|
|
|
+# Estimate the additional sources size
|
|
|
+if [[ -n "$ADD_FILE_SOURCES" ]]; then
|
|
|
+ for i in "${!ADD_FILE_SOURCES[@]}"; do
|
|
|
+ SOURCE_SIZE=$(get_size "${ADD_FILE_SOURCES[$i]}")
|
|
|
DISK_IMAGE_SIZE=$(expr $DISK_IMAGE_SIZE + $SOURCE_SIZE)
|
|
|
done
|
|
|
fi
|
|
|
@@ -266,57 +269,64 @@ fi
|
|
|
# Add extra space for additional resources
|
|
|
DISK_IMAGE_SIZE=$(expr $DISK_IMAGE_SIZE + 20)
|
|
|
|
|
|
+# Make sure target image size is within limits
|
|
|
+MIN_DISK_IMAGE_SIZE=$(hdiutil resize -limits "${DMG_TEMP_NAME}" | awk 'NR=1{print int($1/2048+1)}')
|
|
|
+if [ $MIN_DISK_IMAGE_SIZE -gt $DISK_IMAGE_SIZE ]; then
|
|
|
+ DISK_IMAGE_SIZE=$MIN_DISK_IMAGE_SIZE
|
|
|
+fi
|
|
|
+
|
|
|
# Resize the image for the extra stuff
|
|
|
hdiutil resize ${HDIUTIL_VERBOSITY} -size ${DISK_IMAGE_SIZE}m "${DMG_TEMP_NAME}"
|
|
|
|
|
|
-# mount it
|
|
|
+# mount the new DMG
|
|
|
echo "Mounting disk image..."
|
|
|
MOUNT_DIR="/Volumes/${VOLUME_NAME}"
|
|
|
|
|
|
-# try unmount dmg if it was mounted previously (e.g. developer mounted dmg, installed app and forgot to unmount it)
|
|
|
-DEV_NAME=$(hdiutil info | egrep --color=never '^/dev/' | sed 1q | awk '{print $1}')
|
|
|
-if [ test -d "${MOUNT_DIR}" ]; then
|
|
|
+# Unmount leftover dmg if it was mounted previously (e.g. developer mounted dmg, installed app and forgot to unmount it)
|
|
|
+if [[ -d "${MOUNT_DIR}" ]]; then
|
|
|
echo "Unmounting previously mounted disk image..."
|
|
|
+ DEV_NAME=$(hdiutil info | egrep --color=never '^/dev/' | sed 1q | awk '{print $1}')
|
|
|
hdiutil detach "${DEV_NAME}"
|
|
|
fi
|
|
|
|
|
|
+echo "Mounting disk image..."
|
|
|
+
|
|
|
echo "Mount directory: $MOUNT_DIR"
|
|
|
DEV_NAME=$(hdiutil attach -readwrite -noverify -noautoopen "${DMG_TEMP_NAME}" | egrep --color=never '^/dev/' | sed 1q | awk '{print $1}')
|
|
|
echo "Device name: $DEV_NAME"
|
|
|
|
|
|
-if [ ! -z ${BACKGROUND_FILE+x} ]; then
|
|
|
- echo "Copying background file..."
|
|
|
- test -d "$MOUNT_DIR/.background" || mkdir "$MOUNT_DIR/.background"
|
|
|
+if [[ -n "$BACKGROUND_FILE" ]]; then
|
|
|
+ echo "Copying background file '$BACKGROUND_FILE'..."
|
|
|
+ [[ -d "$MOUNT_DIR/.background" ]] || mkdir "$MOUNT_DIR/.background"
|
|
|
cp "$BACKGROUND_FILE" "$MOUNT_DIR/.background/$BACKGROUND_FILE_NAME"
|
|
|
fi
|
|
|
|
|
|
-if [ ! -z ${APPLICATION_LINK+x} ]; then
|
|
|
+if [[ -n "$APPLICATION_LINK" ]]; then
|
|
|
echo "making link to Applications dir"
|
|
|
test -d "$MOUNT_DIR/Applications" || ln -s /Applications "$MOUNT_DIR/Applications"
|
|
|
fi
|
|
|
|
|
|
-if [ ! -z ${QL_LINK+x} ]; then
|
|
|
+if [[ -n "$QL_LINK" ]]; then
|
|
|
echo "making link to QuickLook install dir"
|
|
|
ln -s "/Library/QuickLook" "$MOUNT_DIR/QuickLook"
|
|
|
fi
|
|
|
|
|
|
-if [ ! -z ${VOLUME_ICON_FILE+x} ]; then
|
|
|
+if [[ -n "$VOLUME_ICON_FILE" ]]; then
|
|
|
echo "Copying volume icon file '$VOLUME_ICON_FILE'..."
|
|
|
cp "$VOLUME_ICON_FILE" "$MOUNT_DIR/.VolumeIcon.icns"
|
|
|
SetFile -c icnC "$MOUNT_DIR/.VolumeIcon.icns"
|
|
|
fi
|
|
|
|
|
|
-if [ ! -z ${ADD_FILE_SOURCES+x} ]; then
|
|
|
+if [[ -n "$ADD_FILE_SOURCES" ]]; then
|
|
|
echo "Copying custom files..."
|
|
|
- for i in "${!ADD_FILE_SOURCES[@]}"
|
|
|
- do
|
|
|
+ for i in "${!ADD_FILE_SOURCES[@]}"; do
|
|
|
echo "${ADD_FILE_SOURCES[$i]}"
|
|
|
cp -a "${ADD_FILE_SOURCES[$i]}" "$MOUNT_DIR/${ADD_FILE_TARGETS[$i]}"
|
|
|
done
|
|
|
fi
|
|
|
|
|
|
-# run applescript
|
|
|
-APPLESCRIPT=$(mktemp -t createdmg.tmp.XXXXXXXXXX)
|
|
|
+# run AppleScript to do all the Finder cosmetic stuff
|
|
|
+APPLESCRIPT_FILE=$(mktemp -t createdmg.tmp.XXXXXXXXXX)
|
|
|
|
|
|
function applescript_source() {
|
|
|
if [ $BREW_INSTALL -eq 0 ]; then
|
|
|
@@ -328,14 +338,34 @@ EOS
|
|
|
fi
|
|
|
}
|
|
|
|
|
|
-if [ $SKIP_JENKINS -eq 0 ]; then
|
|
|
- applescript_source | sed -e "s/WINX/$WINX/g" -e "s/WINY/$WINY/g" -e "s/WINW/$WINW/g" -e "s/WINH/$WINH/g" -e "s/BACKGROUND_CLAUSE/$BACKGROUND_CLAUSE/g" -e "s/REPOSITION_HIDDEN_FILES_CLAUSE/$REPOSITION_HIDDEN_FILES_CLAUSE/g" -e "s/ICON_SIZE/$ICON_SIZE/g" -e "s/TEXT_SIZE/$TEXT_SIZE/g" | perl -pe "s/POSITION_CLAUSE/$POSITION_CLAUSE/g" | perl -pe "s/QL_CLAUSE/$QL_CLAUSE/g" | perl -pe "s/APPLICATION_CLAUSE/$APPLICATION_CLAUSE/g" | perl -pe "s/HIDING_CLAUSE/$HIDING_CLAUSE/" >"$APPLESCRIPT"
|
|
|
- sleep 2 # pause to workaround occasional "Can’t get disk" (-1728) issues
|
|
|
- echo "Running Applescript: /usr/bin/osascript \"${APPLESCRIPT}\" \"${VOLUME_NAME}\""
|
|
|
- (/usr/bin/osascript "${APPLESCRIPT}" "${VOLUME_NAME}" || if [[ "$?" -ne 0 ]]; then echo "Failed running AppleScript"; hdiutil detach "${DEV_NAME}"; exit 64; fi)
|
|
|
- echo "Done running the applescript..."
|
|
|
- sleep 4
|
|
|
- rm "$APPLESCRIPT"
|
|
|
+if [[ $SANDBOX_SAFE -eq 1 ]]; then
|
|
|
+ echo "Skipping Finder-prettifying AppleScript because we are in Sandbox..."
|
|
|
+else
|
|
|
+ if [[ $SKIP_JENKINS -eq 0 ]]; then
|
|
|
+ applescript_source \
|
|
|
+ | sed -e "s/WINX/$WINX/g" -e "s/WINY/$WINY/g" -e "s/WINW/$WINW/g" \
|
|
|
+ -e "s/WINH/$WINH/g" -e "s/BACKGROUND_CLAUSE/$BACKGROUND_CLAUSE/g" \
|
|
|
+ -e "s/REPOSITION_HIDDEN_FILES_CLAUSE/$REPOSITION_HIDDEN_FILES_CLAUSE/g" \
|
|
|
+ -e "s/ICON_SIZE/$ICON_SIZE/g" -e "s/TEXT_SIZE/$TEXT_SIZE/g" \
|
|
|
+ | perl -pe "s/POSITION_CLAUSE/$POSITION_CLAUSE/g" \
|
|
|
+ | perl -pe "s/QL_CLAUSE/$QL_CLAUSE/g" \
|
|
|
+ | perl -pe "s/APPLICATION_CLAUSE/$APPLICATION_CLAUSE/g" \
|
|
|
+ | perl -pe "s/HIDING_CLAUSE/$HIDING_CLAUSE/" \
|
|
|
+ > "$APPLESCRIPT_FILE"
|
|
|
+ sleep 2 # pause to workaround occasional "Can’t get disk" (-1728) issues
|
|
|
+ echo "Running AppleScript to make Finder stuff pretty: /usr/bin/osascript \"${APPLESCRIPT_FILE}\" \"${VOLUME_NAME}\""
|
|
|
+ if /usr/bin/osascript "${APPLESCRIPT_FILE}" "${VOLUME_NAME}"; then
|
|
|
+ # Okay, we're cool
|
|
|
+ true
|
|
|
+ else
|
|
|
+ echo >&2 "Failed running AppleScript"
|
|
|
+ hdiutil detach "${DEV_NAME}"
|
|
|
+ exit 64
|
|
|
+ fi
|
|
|
+ echo "Done running the AppleScript..."
|
|
|
+ sleep 4
|
|
|
+ rm "$APPLESCRIPT_FILE"
|
|
|
+ fi
|
|
|
fi
|
|
|
|
|
|
# make sure it's not world writeable
|
|
|
@@ -344,7 +374,7 @@ chmod -Rf go-w "${MOUNT_DIR}" &> /dev/null || true
|
|
|
echo "Done fixing permissions."
|
|
|
|
|
|
# make the top window open itself on mount:
|
|
|
-if [ $SANDBOX_SAFE -eq 0 ]; then
|
|
|
+if [[ $SANDBOX_SAFE -eq 0 ]]; then
|
|
|
echo "Blessing started"
|
|
|
bless --folder "${MOUNT_DIR}" --openfolder "${MOUNT_DIR}"
|
|
|
echo "Blessing finished"
|
|
|
@@ -352,38 +382,74 @@ else
|
|
|
echo "Skipping blessing on sandbox"
|
|
|
fi
|
|
|
|
|
|
-if [ ! -z ${VOLUME_ICON_FILE+x} ]; then
|
|
|
+if [[ -n "$VOLUME_ICON_FILE" ]]; then
|
|
|
# tell the volume that it has a special file attribute
|
|
|
SetFile -a C "$MOUNT_DIR"
|
|
|
fi
|
|
|
|
|
|
+# Delete unnecessary file system events log
|
|
|
+echo "Deleting .fseventsd"
|
|
|
+rm -rf "${MOUNT_DIR}/.fseventsd"
|
|
|
+
|
|
|
# unmount
|
|
|
-echo "Unmounting disk image..."
|
|
|
-hdiutil detach "${DEV_NAME}"
|
|
|
+unmounting_attempts=0
|
|
|
+until
|
|
|
+ echo "Unmounting disk image..."
|
|
|
+ (( unmounting_attempts++ ))
|
|
|
+ hdiutil detach "${DEV_NAME}"
|
|
|
+ exit_code=$?
|
|
|
+ (( exit_code == 0 )) && break # nothing goes wrong
|
|
|
+ (( exit_code != 16 )) && exit $exit_code # exit with the original exit code
|
|
|
+ # The above statement returns 1 if test failed (exit_code == 16).
|
|
|
+ # It can make the code in the {do... done} block to be executed
|
|
|
+do
|
|
|
+ (( unmounting_attempts == MAXIMUM_UNMOUNTING_ATTEMPTS )) && exit 16 # patience exhausted, exit with code EBUSY
|
|
|
+ echo "Wait a moment..."
|
|
|
+ sleep $(( 1 * (2 ** unmounting_attempts) ))
|
|
|
+done
|
|
|
+unset unmounting_attempts
|
|
|
|
|
|
# compress image
|
|
|
echo "Compressing disk image..."
|
|
|
-hdiutil convert ${HDIUTIL_VERBOSITY} "${DMG_TEMP_NAME}" -format ${FORMAT} ${IMAGEKEY} -o "${DMG_DIR}/${DMG_NAME}"
|
|
|
+hdiutil convert ${HDIUTIL_VERBOSITY} "${DMG_TEMP_NAME}" -format "${FORMAT}" ${IMAGEKEY} -o "${DMG_DIR}/${DMG_NAME}"
|
|
|
rm -f "${DMG_TEMP_NAME}"
|
|
|
|
|
|
# adding EULA resources
|
|
|
-if [ ! -z ${EULA_RSRC+x} ]; then
|
|
|
+if [[ -n "${EULA_RSRC}" && "${EULA_RSRC}" != "-null-" ]]; then
|
|
|
echo "adding EULA resources"
|
|
|
-
|
|
|
- REZ_ARG=""
|
|
|
- if [ ! -z ${REZ_PATH+x} ]; then
|
|
|
- REZ_ARG="--rez ${REZ_PATH}"
|
|
|
- fi
|
|
|
- if [ $BREW_INSTALL -eq 0 ]; then
|
|
|
- "${AUX_PATH}/dmg-license.py" "${DMG_DIR}/${DMG_NAME}" "${EULA_RSRC}" ${REZ_ARG}
|
|
|
+ #
|
|
|
+ # Use udifrez instead flatten/rez/unflatten
|
|
|
+ # https://github.com/create-dmg/create-dmg/issues/109
|
|
|
+ #
|
|
|
+ # Based on a thread from dawn2dusk & peterguy
|
|
|
+ # https://developer.apple.com/forums/thread/668084
|
|
|
+ #
|
|
|
+ EULA_RESOURCES_FILE=$(mktemp -t createdmg.tmp.XXXXXXXXXX)
|
|
|
+ EULA_FORMAT=$(file -b "${EULA_RSRC}")
|
|
|
+ if [[ ${EULA_FORMAT} == 'Rich Text Format data'* ]] ; then
|
|
|
+ EULA_FORMAT='RTF '
|
|
|
else
|
|
|
- python - "${DMG_DIR}/${DMG_NAME}" "${EULA_RSRC}" ${REZ_ARG} <<-'EOS'
|
|
|
- # BREW_INLINE_LICENSE_PLACEHOLDER
|
|
|
-EOS
|
|
|
+ EULA_FORMAT='TEXT'
|
|
|
fi
|
|
|
+
|
|
|
+ # Encode the EULA to base64
|
|
|
+ # Replace 'openssl base64' with 'base64' if Mac OS X 10.6 support is no more needed
|
|
|
+ # EULA_DATA="$(base64 -b 52 "${EULA_RSRC}" | sed s$'/^\(.*\)$/\t\t\t\\1/')"
|
|
|
+ EULA_DATA="$(openssl base64 -in "${EULA_RSRC}" | tr -d '\n' | awk '{gsub(/.{52}/,"&\n")}1' | sed s$'/^\(.*\)$/\t\t\t\\1/')"
|
|
|
+ # Fill the template with the custom EULA contents
|
|
|
+ eval "cat > \"${EULA_RESOURCES_FILE}\" <<EOF
|
|
|
+ $(<${AUX_PATH}/eula-resources-template.xml)
|
|
|
+ EOF
|
|
|
+ "
|
|
|
+ # Apply the resources
|
|
|
+ hdiutil udifrez -xml "${EULA_RESOURCES_FILE}" '' -quiet "${DMG_DIR}/${DMG_NAME}" || {
|
|
|
+ echo "Failed to add the EULA license"
|
|
|
+ exit 1
|
|
|
+ }
|
|
|
+ echo "Successfully added the EULA license"
|
|
|
fi
|
|
|
|
|
|
-if [ ! -z ${NOINTERNET+x} && -a "${NOINTERNET}" == 1 ]; then
|
|
|
+if [[ -n "${NOINTERNET}" && "${NOINTERNET}" == 1 ]]; then
|
|
|
echo "not setting 'internet-enable' on the dmg"
|
|
|
else
|
|
|
# check if hdiutil supports internet-enable
|
|
|
@@ -398,4 +464,4 @@ else
|
|
|
fi
|
|
|
|
|
|
echo "Disk image done"
|
|
|
-exit 0
|
|
|
+exit 0
|
Lucas Fernandes Nogueira