Fix a syntax error in release.sh

makeInstallerOSX.sh will now use mkisofs for its HFS creation if available. (This also allows blessing of folders! Just need to properly figure out the compression now)
	=> Currently generates the same size as the old method, but doesn't require the awful hacks (possibly repeatedly resizing, needing an fstab line)
Issue 954


git-svn-id: http://svn.dmdirc.com/trunk@4160 00569f92-eb28-0410-84fd-f71c24880f

installer/osx/makeInstallerOSX.sh

@@ -39,7 +39,9 @@ LINUXIMAGEDIR=${PWD}/dmg
 # fstab entry should read:
 # ${LINUXIMAGE} ${LINUXIMAGEDIR} auto users,noauto,loop 0 0
 
-
+MKISOFS=`which mkisofs`
+MKISOFS_WORKS="0"
+PREFER_MKISOFS="1"
 MKHFS=`which mkfs.hfs`
 MKHFSPLUS=`which mkfs.hfsplus`
 HDIUTIL=`which hdiutil`
@@ -60,10 +62,23 @@ if [ ! -e "${JNIName}" ]; then
 	fi;
 fi;
 
+USE_MKISOFS="0"
+if [ "" != "${MKISOFS}" ]; then
+	MKISOFS_TEST=`${MKISOFS} --help 2>&1 | grep apple`
+	if [ "" != "${MKISOFS_TEST}" ]; then
+		MKISOFS_WORKS="1"
+		USE_MKISOFS="${PREFER_MKISOFS}"
+	fi;
+fi
+
 if [ "" = "${HDIUTIL}" ]; then
 	if [ "" = "${MKHFS}" -a "" = "${MKHFSPLUS}" ]; then
-		echo "This machine is unable to produce dmg images. Aborting."
-		exit 1;
+		if [ "1" != "${MKISOFS_WORKS}" ]; then
+			echo "This machine is unable to produce dmg images. Aborting."
+			exit 1;
+		else
+			USE_MKISOFS="1"
+		fi;
 	fi;
 fi;
 
@@ -371,86 +386,96 @@ if [ "" = "${HDIUTIL}" ]; then
 	IMGBLOCKSIZE=4096 # OSX Default = 4096
 	MVRES=0
 	createImage() {
-		MVRES=0
-		SIZE=${1}
-		if [ "" = "${MKHFS}" -a "" != "${MKHFSPLUS}" ]; then
-			MKHFS=${MKHFSPLUS}
-		fi;
-		# mkfs.hfs will only create 512kb+ sized images
-		if [ ${SIZE} -lt 524288 ]; then
-			echo "Size is less than 512kb"
-			SIZE=524288;
-		fi;
-		dd if=/dev/zero of=${LINUXIMAGE} bs=${SIZE} count=1
-		${MKHFS} -b ${IMGBLOCKSIZE} -v 'DMDirc' ${LINUXIMAGE}
-		if [ ${?} -ne 0 ]; then
-			echo "mkfs.hfs failed to create the image, aborting."
-			exit 1;
-		fi;
-		# Now try and mount
-		# This could be a problem, as linux requires either root to mount, or an fstab
-		# entry.
-		# Try to mount, if this fails, let the user know what to add to fstab.
-		if [ -e ${LINUXIMAGEDIR} ]; then
-			rm -Rf ${LINUXIMAGEDIR}
-		fi;
-		mkdir ${LINUXIMAGEDIR}
-		mount ${LINUXIMAGEDIR}
-		MOUNTRES=${?}
-		if [ ${MOUNTRES} -ne 0 ]; then
-			# Try using full parameters - could be running as root.
-			mount -t hfsplus -o loop ${RUNNAME} ${LINUXIMAGEDIR}
-			MOUNTRES=${?}
-		fi;
-		if [ ${MOUNTRES} -ne 0 ]; then
-			echo "@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@"
-			echo "@                               ERROR                               @"
-			echo "@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@"
-			echo "You do not have permission to mount the image."
-			echo "Please add the following lines to /etc/fstab and re run this script again"
-			echo "# DMDirc OSX dmg image"
-			echo "${LINUXIMAGE} ${LINUXIMAGEDIR} auto users,noauto,loop 0 0"
-			echo "@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@"
-			echo "@                               ERROR                               @"
-			echo "@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@"
-			exit 1;
-		fi;
-		mv -fv ${DMG}/* ${LINUXIMAGEDIR}
-		MVRES=${?}
-		if [ ${MVRES} -ne 0 ]; then
-			echo "Image incorrect size."
+		if [ "1" = "${USE_MKISOFS}" ]; then
+			# http://lists.apple.com/archives/java-dev/2008/Mar/msg00266.html
+			
+			${MKISOFS} -V 'DMDirc' -no-pad -r -z -apple -o "${LINUXIMAGE}" -hfs-creator "DMDI" -hfs-bless "/Volumes/DMDirc" "${DMG}"
 		else
-			mv -fv ${DMG}/.[A-Za-z]* ${LINUXIMAGEDIR}
+			MVRES=0
+			SIZE=${1}
+			if [ "" = "${MKHFS}" -a "" != "${MKHFSPLUS}" ]; then
+				MKHFS=${MKHFSPLUS}
+			fi;
+			# mkfs.hfs will only create 512kb+ sized images
+			if [ ${SIZE} -lt 524288 ]; then
+				echo "Size is less than 512kb"
+				SIZE=524288;
+			fi;
+			dd if=/dev/zero of=${LINUXIMAGE} bs=${SIZE} count=1
+			${MKHFS} -b ${IMGBLOCKSIZE} -v 'DMDirc' ${LINUXIMAGE}
+			if [ ${?} -ne 0 ]; then
+				echo "mkfs.hfs failed to create the image, aborting."
+				exit 1;
+			fi;
+			# Now try and mount
+			# This could be a problem, as linux requires either root to mount, or an fstab
+			# entry.
+			# Try to mount, if this fails, let the user know what to add to fstab.
+			if [ -e ${LINUXIMAGEDIR} ]; then
+				rm -Rf ${LINUXIMAGEDIR}
+			fi;
+			mkdir ${LINUXIMAGEDIR}
+			mount ${LINUXIMAGEDIR}
+			MOUNTRES=${?}
+			if [ ${MOUNTRES} -ne 0 ]; then
+				# Try using full parameters - could be running as root.
+				mount -t hfsplus -o loop ${RUNNAME} ${LINUXIMAGEDIR}
+				MOUNTRES=${?}
+			fi;
+			if [ ${MOUNTRES} -ne 0 ]; then
+				echo "@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@"
+				echo "@                               ERROR                               @"
+				echo "@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@"
+				echo "You do not have permission to mount the image."
+				echo "Please add the following lines to /etc/fstab and re run this script again"
+				echo "# DMDirc OSX dmg image"
+				echo "${LINUXIMAGE} ${LINUXIMAGEDIR} auto users,noauto,loop 0 0"
+				echo "@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@"
+				echo "@                               ERROR                               @"
+				echo "@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@"
+				exit 1;
+			fi;
+			mv -fv ${DMG}/* ${LINUXIMAGEDIR}
 			MVRES=${?}
 			if [ ${MVRES} -ne 0 ]; then
 				echo "Image incorrect size."
+			else
+				mv -fv ${DMG}/.[A-Za-z]* ${LINUXIMAGEDIR}
+				MVRES=${?}
+				if [ ${MVRES} -ne 0 ]; then
+					echo "Image incorrect size."
+				fi;
 			fi;
+			umount ${LINUXIMAGEDIR}
+			# If anyone finds out how to compress these nicely, add it here.
 		fi;
-		umount ${LINUXIMAGEDIR}
-		# If anyone finds out how to compress these nicely, add it here.
 	}
 	
-	INCREASE=10
-	IMAGESIZE=$(((`du -s --block-size ${IMGBLOCKSIZE} ${DMG} | awk '{print $1}'` + ${INCREASE}) * ${IMGBLOCKSIZE} ))
-	createImage ${IMAGESIZE}
-	
-	# This sucks, but it makes sure the image gets created at a size that contains
-	# everything.
-	# I can't manage to get du to return the size that the files actually end up
-	# using on the image.
-	TRIES=0
-	while [ ${MVRES} -ne 0 -a ${TRIES} -ne 5 ]; do
-		TRIES=$((${TRIES} + 1))
-		echo "Previous ImageSize of ${IMAGESIZE} failed"
-		INCREASE=$((${INCREASE} + 5))
+	if [ "1" = "${USE_MKISOFS}" ]; then
+		createImage
+	else
+		INCREASE=10
 		IMAGESIZE=$(((`du -s --block-size ${IMGBLOCKSIZE} ${DMG} | awk '{print $1}'` + ${INCREASE}) * ${IMGBLOCKSIZE} ))
-		echo "Trying to build with ImageSize ${IMAGESIZE}"
 		createImage ${IMAGESIZE}
-	done;
-	
-	if [ ${MVRES} -ne 0 ]; then
-		echo "OSX Build Failed - Imagesize: ${IMAGESIZE}"
-		exit 1;
+		
+		# This sucks, but it makes sure the image gets created at a size that contains
+		# everything.
+		# I can't manage to get du to return the size that the files actually end up
+		# using on the image.
+		TRIES=0
+		while [ ${MVRES} -ne 0 -a ${TRIES} -ne 5 ]; do
+			TRIES=$((${TRIES} + 1))
+			echo "Previous ImageSize of ${IMAGESIZE} failed"
+			INCREASE=$((${INCREASE} + 5))
+			IMAGESIZE=$(((`du -s --block-size ${IMGBLOCKSIZE} ${DMG} | awk '{print $1}'` + ${INCREASE}) * ${IMGBLOCKSIZE} ))
+			echo "Trying to build with ImageSize ${IMAGESIZE}"
+			createImage ${IMAGESIZE}
+		done;
+		
+		if [ ${MVRES} -ne 0 ]; then
+			echo "OSX Build Failed - Imagesize: ${IMAGESIZE}"
+			exit 1;
+		fi;
 	fi;
 	
 	if [ "${LINUXIMAGE}" != "${RUNNAME}" ]; then

installer/release.sh

@@ -173,72 +173,6 @@ echo "Removing existing releases from output directory"
 echo "================================================================"
 rm -Rf output/*.run output/*.exe output/*.dmg
 
-# OSX doesn't use the installer
-# and neither does anything else now,
-#if [ "osx" != "${BUILDTARGET}" ]; then
-#	echo "================================================================"
-#	echo "Building Installer JAR "
-#	echo "================================================================"
-#	mkdir -p installer_temp/build
-#	cd installer_temp
-#	ln -sf ../../src/com
-#	ln -sf ../../src/net
-#	# I don't know why, but -d doesn't nicely put ALL generated class files here,
-#	# just those that were in the dir of the java file that was requested for compile
-#	# So we specify each of the different ones we want built into the jar file here.
-#	FILELIST="com/dmdirc/installer/*.java"
-#	FILELIST=${FILELIST}" com/dmdirc/installer/cliparser/*.java"
-#	FILELIST=${FILELIST}" com/dmdirc/ui/swing/dialogs/wizard/*.java"
-#	FILELIST=${FILELIST}" com/dmdirc/ui/interfaces/MainWindow.java"
-#	FILELIST=${FILELIST}" com/dmdirc/ui/swing/MainFrame.java"
-#	FILELIST=${FILELIST}" com/dmdirc/ui/swing/UIUtilities.java"
-#	FILELIST=${FILELIST}" com/dmdirc/ui/swing/UIUtilities.java"
-#	FILELIST=${FILELIST}" com/dmdirc/ui/swing/components/StandardDialog.java"
-#	FILELIST=${FILELIST}" com/dmdirc/util/ListenerList.java"
-#	FILELIST=${FILELIST}" com/dmdirc/util/WeakMapList.java"
-#	FILELIST=${FILELIST}" com/dmdirc/util/MapList.java"
-#	FILELIST=${FILELIST}" com/dmdirc/ui/swing/components/EtchedLineBorder.java"
-#	FILELIST=${FILELIST}" com/dmdirc/util/EquatableWeakReference.java"
-#	FILELIST=${FILELIST}" com/dmdirc/ui/swing/components/JWrappingLabel.java"
-#	FILELIST=${FILELIST}" com/dmdirc/util/WeakList.java"
-#	FILELIST=${FILELIST}" net/miginfocom/layout/*.java"
-#	FILELIST=${FILELIST}" net/miginfocom/swing/*.java"
-#	
-#	${JAVAC} -d ./build ${FILELIST}
-#	
-#	if [ $? -ne 0 ]; then
-#		echo "================================================================"
-#		echo "Building installer failed."
-#		echo "================================================================"
-#		cd ${THISDIR}
-#		rm -Rf installer_temp
-#		exit 1;
-#	fi
-#	
-#	cd build
-#	echo "Manifest-Version: 1.0" > manifest.txt
-#	echo "Created-By: DMDirc Installer" >> manifest.txt
-#	echo "Main-Class: com.dmdirc.installer.Main" >> manifest.txt
-#	echo "Class-Path: " >> manifest.txt
-#	echo "" >> manifest.txt
-#	${JAR} cmf manifest.txt installer.jar com net
-#	if [ $? -ne 0 ]; then
-#		echo "================================================================"
-#		echo "Building installer failed."
-#		echo "================================================================"
-#		cd ${THISDIR}
-#		rm -Rf installer_temp
-#		exit 1;
-#	else
-#		rm -Rf ${THISDIR}/common/installer.jar
-#		mv installer.jar ${THISDIR}/common/installer.jar
-#	fi
-#	
-#	cd ${THISDIR}
-#	rm -Rf installer_temp
-#fi;
-
-
 # Copy default settings from www to trunk for compile (if they exist, and we are
 # building a new jar)
 REVERTLIST=""
@@ -302,22 +236,6 @@ if [ "osx" = "${BUILDTARGET}" -o "" = "${BUILDTARGET}" ]; then
 	cd ${THISDIR}
 fi;
 
-#MD5BIN=`which md5sum`
-#if [ "${MD5BIN}" != "" ]; then
-#	echo "================================================================"
-#	echo "Creating MD5SUM files"
-#	echo "================================================================"
-#	cd output
-#	for outputFile in *; do
-#		if [ "${outputFile##*.}" != "md5" ]; then
-#			if [ -e "${outputFile}.md5" ]; then
-#				rm -f "${outputFile}.md5"
-#			fi
-#			${MD5BIN} "${outputFile}" > "${outputFile}.md5"
-#		fi
-#	done
-#	cd ${THISDIR}
-#fi
 
 echo "================================================================"
 echo "Clean Up"
@@ -328,7 +246,7 @@ for updatedir in ${REVERTLIST}; do
 	${SVN} revert ${updatedir}/*
 done;
 
-if [ "1" = "${UPLOAD}" && "1" = "${TAG}" ]; then
+if [ "1" = "${UPLOAD}" -a "1" = "${TAG}" ]; then
 	echo "================================================================"
 	echo "Uploading to GoogleCode"
 	echo "================================================================"