From 99f421bf7357e0354157d0d0291a082fd3554377 Mon Sep 17 00:00:00 2001 From: Amar Takhar Date: Fri, 4 Sep 2009 02:16:39 +0000 Subject: [PATCH] Set the .DS_Store file in the temp dmg directory rather than after it's mounted. jfs reported finder crashing after updating to 10.5.8. Setting it this way should work and avoid the issue of .DS_Store changing randomly as a folder won't show up on the desktop like a mounted image will. Originally committed to SVN as r3481. --- aegisub/tools/osx-dmg.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/aegisub/tools/osx-dmg.sh b/aegisub/tools/osx-dmg.sh index da596ddbb..6501e2a7f 100755 --- a/aegisub/tools/osx-dmg.sh +++ b/aegisub/tools/osx-dmg.sh @@ -41,6 +41,10 @@ mkdir -v "${TMP_DMG}/.background" cp -v packages/osx_dmg/dmg_background.png "${TMP_DMG}/.background/background.png" cp -v packages/osx_bundle/Contents/Resources/Aegisub.icns "${TMP_DMG}/.VolumeIcon.icns" +echo +echo "--- Generating /Volumes/${PKG_NAME_VOLUME}/.DS_Store ----" +/usr/bin/perl tools/osx-dmg-dsstore.pl "${TMP_DMG}/.DS_Store" "${PKG_DIR}" "${TMP_DMG}/.background/background.png" || exit $? + echo echo "---- Creating image ----" /usr/bin/hdiutil create -srcfolder "${TMP_DMG}" -volname "${PKG_NAME}" -fs HFS+ -fsargs "-c c=64,a=16,e=16" -format UDRW "${PKG_NAME_RW}" || exit $? @@ -58,10 +62,6 @@ echo echo "---- Setting root icon using SetFile ----" SetFile -a C "/Volumes/${PKG_NAME_VOLUME}" || exit $? -echo -echo "--- Generating /Volumes/${PKG_NAME_VOLUME}/.DS_Store ----" -/usr/bin/perl tools/osx-dmg-dsstore.pl "/Volumes/${PKG_NAME_VOLUME}/.DS_Store" "${PKG_DIR}" "/Volumes/${PKG_NAME_VOLUME}/.background/background.png" || exit $? - echo echo "---- Detaching ----" /usr/bin/hdiutil detach "${DEV_NAME}" -force || exit $?