Skip to content

Commit

Permalink
Fixes an issue with building under 10.5.
Browse files Browse the repository at this point in the history
The 10.5 version of "cp" doesn't support the "-a" option, though
it's just a shorthand for "-pPR", so it's easily fixed.
  • Loading branch information
fhgwright committed Jan 22, 2015
1 parent 3b2782a commit f720f20
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
8 changes: 4 additions & 4 deletions build.d/targets/release.sh
Original file line number Diff line number Diff line change
Expand Up @@ -115,15 +115,15 @@ function release_build

# Copy license to disk image

/bin/cp -a "${BUILD_SOURCE_DIRECTORY}/support/DiskImage/License.rtf" "${disk_image_mount_point}/License.rtf" 1>&3 2>&4
/bin/cp -pPR "${BUILD_SOURCE_DIRECTORY}/support/DiskImage/License.rtf" "${disk_image_mount_point}/License.rtf" 1>&3 2>&4
detach_die_on_error "Failed to copy license to disk image"

/usr/bin/xcrun SetFile -a E "${disk_image_mount_point}/License.rtf" 1>&3 2>&4
detach_die_on_error "Failed to hide extension of license"

# Copy extras to disk image

/bin/cp -a "${BUILD_SOURCE_DIRECTORY}/support/DiskImage/Extras" "${disk_image_mount_point}/Extras" 1>&3 2>&4
/bin/cp -pPR "${BUILD_SOURCE_DIRECTORY}/support/DiskImage/Extras" "${disk_image_mount_point}/Extras" 1>&3 2>&4
detach_die_on_error "Failed to copy extras to disk image"

/usr/bin/xcrun SetFile -a E "${disk_image_mount_point}/Extras"/* 1>&3 2>&4
Expand All @@ -143,7 +143,7 @@ function release_build
local disk_image_distribution_package_relative_path="Extras/FUSE for OS X ${osxfuse_version}.pkg"
local disk_image_distribution_package_path="${disk_image_mount_point}/${disk_image_distribution_package_relative_path}"

/bin/cp -a "${distribution_package_path}" "${disk_image_distribution_package_path}" 1>&3 2>&4
/bin/cp -pPR "${distribution_package_path}" "${disk_image_distribution_package_path}" 1>&3 2>&4
detach_die_on_error "Failed to copy distribution package to disk image"

/usr/bin/xcrun SetFile -a E "${disk_image_distribution_package_path}" 1>&3 2>&4
Expand All @@ -167,7 +167,7 @@ EOF
# Copy custom background to disk image

/bin/mkdir -p "${disk_image_mount_point}/.background" 1>&3 2>&4 && \
/bin/cp -a "${BUILD_SOURCE_DIRECTORY}/support/DiskImage/background.tiff" "${disk_image_mount_point}/.background/background.tiff" 1>&3 2>&4
/bin/cp -pPR "${BUILD_SOURCE_DIRECTORY}/support/DiskImage/background.tiff" "${disk_image_mount_point}/.background/background.tiff" 1>&3 2>&4
detach_die_on_error "Failed to copy background image to disk image"

# Adjust view options of disk image
Expand Down
2 changes: 1 addition & 1 deletion build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -554,7 +554,7 @@ function build_target_install
common_assert "[[ ! -e `string_escape "${target}"` ]]" "Target is already installed"
fi

local -a command=(/bin/cp -a "${source}" "${target}")
local -a command=(/bin/cp -pPR "${source}" "${target}")
if (( root == 0 ))
then
"${command[@]}" 1>&3 2>&4
Expand Down

0 comments on commit f720f20

Please sign in to comment.