* Fixed OS X build scripts.

admin/mac/Info.plist

@@ -19,7 +19,7 @@
 	<key>CFBundleSignature</key>
 	<string>tomahawk</string>
 	<key>CFBundleIconFile</key>
-	<string>tomahawk.icns</string>
+	<string>Tomahawk.icns</string>
 	<key>CFBundleName</key>
 	<string>Tomahawk</string>
 	<key>LSMinimumSystemVersion</key>

admin/mac/build-release-osx.sh

@@ -48,16 +48,19 @@ CREATEDMG='1'
     header "Running install_name_tool"
     $ROOT/../admin/mac/deposx.sh
 
-    header "Renaming icon"
+    header "Renaming icon & copying Info.plist"
-    mv Contents/Resources/tomahawkSources.icns Contents/Resources/tomahawk.icns
+    mv Contents/Resources/tomahawkSources.icns Contents/Resources/Tomahawk.icns
+    cp $ROOT/../admin/mac/Info.plist Contents/Info.plist
 
     header "Copying Sparkle pubkey & framework, and qt.conf"
     cp $ROOT/../admin/mac/sparkle_pub.pem Contents/Resources
     cp -R /Library/Frameworks/Sparkle.framework Contents/Frameworks
     cp $ROOT/../admin/mac/qt.conf Contents/Resources
 
-    header "Renaming app bundle"
+    header "Creating DMG"
     cd ..
     mv tomahawk.app Tomahawk.app
+    $ROOT/../admin/mac/create-dmg.sh Tomahawk.app
+    mv Tomahawk.app tomahawk.app
 
     header "Done!"

admin/mac/create-dmg.sh

@@ -43,11 +43,17 @@ ln -s /Applications "$TMP/Applications"
 cp -R "$IN" "$TMP"
 
 # create
-hdiutil create -srcfolder "$TMP" \
+hdiutil makehybrid -hfs -hfs-volume-name Tomahawk -hfs-openfolder "$TMP" "$TMP" -o tmp.dmg
-               -format UDZO -imagekey zlib-level=9 \
+hdiutil convert -format UDZO -imagekey zlib-level=9 tmp.dmg -o "$OUT"
-               -scrub \
+
-               "$OUT" \
+# cleanup
-               || die "Error creating DMG :("
+rm tmp.dmg
+
+#hdiutil create -srcfolder "$TMP" \
+#               -format UDZO -imagekey zlib-level=9 \
+#               -scrub \
+#               "$OUT" \
+#               || die "Error creating DMG :("
 
 # done !
 echo 'DMG size:' `du -hs "$OUT" | awk '{print $1}'`