[Slim-Checkins] r33674 - in /7.7/trunk: buildme.pl platforms/osx/Preference Pane/run-installer.sh

Author: mherger
Date: Wed Nov  9 06:45:16 2011
New Revision: 33674

URL: http://svn.slimdevices.com/slim?rev=33674&view=rev
Log:
Bug: 17741
Description: on OSX 7.6 and older server installations come with a hard coded installer name of "Squeezebox Server Installer". This fails with the renamed product. Keep a hidden link of that name in place for backward compatibility, and add a new, hidden and generic link for future releases

Modified:
    7.7/trunk/buildme.pl
    7.7/trunk/platforms/osx/Preference Pane/run-installer.sh

Modified: 7.7/trunk/buildme.pl
URL: http://svn.slimdevices.com/slim/7.7/trunk/buildme.pl?rev=33674&r1=33673&r2=33674&view=diff
==============================================================================
--- 7.7/trunk/buildme.pl (original)
+++ 7.7/trunk/buildme.pl Wed Nov  9 06:45:16 2011
@@ -689,10 +689,6 @@
 		print "INFO: Copying MacOSX Installer...\n";
 		system("ditto \"$xcodeBuildDir/Installer.app\" \"$buildDir/$diskImageName/Squeezebox Server Installer.app\" ");
 	
-		# .svn directories have already been removed.
-		system("mv \"$buildDir/server\" \"$contentsDir/\" ");
-		system("mv \"$buildDir/platforms/osx/10.3\" \"$contentsDir/\" ");
-	
 		print "INFO: Copying MacOSX Launcher App...\n";
 		system("ditto \"$xcodeBuildDir/Launcher.app\" \"$contentsDir/server/Launcher.app\"");
 	
@@ -715,7 +711,10 @@
 
 		print "INFO: Copying over MacOSX Files...\n";
 		system("ditto -rsrc \"$buildDir/$diskImageName\" \"$scDiskImageMountPoint\" ");
-		system("mv \"$scDiskImageMountPoint/Squeezebox Server Installer.app\" \"$scDiskImageMountPoint/Logitech Media Server Installer.app\" ");
+		# backward compatibility: leave "Squeezebox Server Installer" in place, but hide it, add user visible link called "Logitech Media Server Installer"
+		system("cd \"$scDiskImageMountPoint\" && ln -s \"Squeezebox Server Installer.app\" \"Logitech Media Server Installer.app\" && setfile -a V \"Squeezebox Server Installer.app\"");
+		# moving forward we're going to launch install.app instead
+		system("cd \"$scDiskImageMountPoint\" && ln -s \"Squeezebox Server Installer.app\" \".install.app\"");
 	
 		print "INFO: Making auto open\n";
 		system("$buildDir/openUp \"$scDiskImageMountPoint\" ");

Modified: 7.7/trunk/platforms/osx/Preference Pane/run-installer.sh
URL: http://svn.slimdevices.com/slim/7.7/trunk/platforms/osx/Preference%20Pane/run-installer.sh?rev=33674&r1=33673&r2=33674&view=diff
==============================================================================
--- 7.7/trunk/platforms/osx/Preference Pane/run-installer.sh (original)
+++ 7.7/trunk/platforms/osx/Preference Pane/run-installer.sh Wed Nov  9 06:45:16 2011
@@ -1,7 +1,9 @@
-#! /bin/sh
+#!/bin/sh
+
+# this script is being called from the PrefPane to launch the installer
 
 MOUNTPOINT=/Volumes/SCInstaller
-INSTALLER="/Volumes/SCInstaller/Logitech Media Server Installer.app"
+INSTALLER="/Volumes/SCInstaller/.install.app"
 
 if [ -e "$1" ] ; then
 	xattr -d com.apple.quarantine $1