[vidalia-svn] r3778: clean up the if..then statements (vidalia/trunk/pkg/osx)

[phobos@xxxxxxxxxxxxxxxxxxx]

Author: phobos
Date: 2009-05-17 00:22:14 -0400 (Sun, 17 May 2009)
New Revision: 3778

Modified:
   vidalia/trunk/pkg/osx/builddmg.sh.in
Log:
clean up the if..then statements


Modified: vidalia/trunk/pkg/osx/builddmg.sh.in
===================================================================
--- vidalia/trunk/pkg/osx/builddmg.sh.in	2009-05-17 04:18:13 UTC (rev 3777)
+++ vidalia/trunk/pkg/osx/builddmg.sh.in	2009-05-17 04:22:14 UTC (rev 3778)
@@ -52,10 +52,8 @@
 # Set the Tor version
 TORVERSION="$4"
 # Set the name of the output .dmg file
-if [ $3 = "bundle" ]; then
+if [ $3 = "bundle" || $3 = "split-bundle" ]; then
   DMG="vidalia-bundle-$TORVERSION-$VERSION-$ARCH.dmg"
-elseif [ $3 = "split-bundle" ]; then
-  DMG="vidalia-bundle-$TORVERSION-$VERSION-$ARCH.dmg"
 else
   DMG="vidalia-$VERSION-$ARCH.dmg"
 fi
@@ -79,10 +77,11 @@
 ln -s /Applications $BUILD_DIR/Applications
 
 # Create the disk image
-if [ $3 = "bundle" ]; then
+if [ $3 = "split-bundle" ]; then
   hdiutil create -format UDZO -imagekey zlib-level=9 -srcfolder "$BUILD_DIR" -volname "$volname" "$DMG"
-elseif [ $3 = "split-bundle" ]; then
-  hdiutil create -format UDZO -imagekey zlib-level=9 -srcfolder "$BUILD_DIR" -volname "$volname" "$DMG" &&
   hdiutil segment -segmentSize 1.5m -o "split-$DMG" "$DMG"
+else
+  hdiutil create -format UDZO -imagekey zlib-level=9 -srcfolder "$BUILD_DIR" -volname "$volname" "$DMG" &&
 fi
+
 rm -rf "$BUILD_DIR"