Changeset 482

Timestamp:

07/14/08 03:11:27 (16 years ago)

Author:

Nicholas Riley

Message:

package-ICeCoffEE.sh: Long-overdue use of -e instead of repeated &&.

File:

• trunk/ICeCoffEE/package-ICeCoffEE.sh (modified) (2 diffs)

trunk/ICeCoffEE/package-ICeCoffEE.sh

@@ -1 @@
-#!/bin/sh
+#!/bin/sh -e
 
 set -x -v
@@ -6 +6 @@
 PRODUCT="ICeCoffEE"
 
-cd "$PRODUCT" && \
-source VERSION.xcconfig && \
-find . -name \*~ -exec rm '{}' \; && \
-VERSION=${CURRENT_MARKETING_VERSION} && \
-DMG="$PRODUCT-$VERSION.dmg" VOL="$PRODUCT $VERSION" && \
-DSTROOT="$PACKAGEDIR/$VOL" && \
-sudo rm -rf "$DSTROOT" && \
-sudo rm -rf build/ && \
-rm -rf build/ && \
-xcodebuild -target "ICeCoffEE Installer" -configuration Deployment "DSTROOT=$DSTROOT" DEPLOYMENT_LOCATION=YES install && \
-mkdir "$DSTROOT" && \
-mv "build/Deployment/$PRODUCT Installer.app" "$DSTROOT/$PRODUCT $VERSION Installer.app" && \
-sudo rm -rf build/ && \
-find "$DSTROOT" -name ".svn" -type d -exec sudo /bin/rm -rf "{}" \;
+cd "$PRODUCT"
+source VERSION.xcconfig
+find . -name \*~ -exec rm '{}' \;
+VERSION=${CURRENT_MARKETING_VERSION}
+DMG="$PRODUCT-$VERSION.dmg" VOL="$PRODUCT $VERSION"
+DSTROOT="$PACKAGEDIR/$VOL"
+sudo rm -rf "$DSTROOT"
+sudo rm -rf build/
+rm -rf build/
+xcodebuild -target "ICeCoffEE Installer" -configuration Deployment "DSTROOT=$DSTROOT" DEPLOYMENT_LOCATION=YES install
+mkdir "$DSTROOT"
+mv "build/Deployment/$PRODUCT Installer.app" "$DSTROOT/$PRODUCT $VERSION Installer.app"
+sudo rm -rf build/
+find "$DSTROOT" -name ".svn" -type d -exec sudo /bin/rm -rf "{}" \; || true
 # uncomment to include localizations
-find "$DSTROOT" -name \*.lproj -type d -and -not -name English.lproj -exec sudo rm -rf "{}" \;
-cd "$PACKAGEDIR" && \
-rm -f "$DMG" && \
-hdiutil create "$DMG" -megabytes 5 -ov -layout NONE -fs 'HFS+' -volname "$VOL" && \
-MOUNT=`hdiutil attach "$DMG"` && \
-DISK=`echo "$MOUNT" | sed -ne ' s|^/dev/\([^ ]*\).*$|\1|p'` && \
-MOUNTPOINT=`echo "$MOUNT" | sed -ne 's|^.*\(/Volumes/.*\)$|\1|p'` && \
-ditto -rsrc "$DSTROOT" "$MOUNTPOINT" && \
-sudo chmod -R a+rX,u+w "$MOUNTPOINT" && \
-# openUp "$MOUNTPOINT" && \
-hdiutil detach $DISK && \
-hdiutil resize -sectors min "$DMG" && \
-hdiutil convert "$DMG" -format UDZO -imagekey zlib-level=9 -o "z$DMG" && \
-mv "z$DMG" "$DMG" && \
-hdiutil internet-enable "$DMG" && \
+find "$DSTROOT" -name \*.lproj -type d -and -not -name English.lproj -exec sudo rm -rf "{}" \; || true
+cd "$PACKAGEDIR"
+rm -f "$DMG"
+# XXX can make shorter now with hdiutil create -srcfolder...
+hdiutil create "$DMG" -megabytes 5 -ov -layout NONE -fs 'HFS+' -volname "$VOL"
+MOUNT=`hdiutil attach "$DMG"`
+DISK=`echo "$MOUNT" | sed -ne ' s|^/dev/\([^ ]*\).*$|\1|p'`
+MOUNTPOINT=`echo "$MOUNT" | sed -ne 's|^.*\(/Volumes/.*\)$|\1|p'`
+ditto -rsrc "$DSTROOT" "$MOUNTPOINT"
+sudo chmod -R a+rX,u+w "$MOUNTPOINT"
+hdiutil detach $DISK
+hdiutil resize -sectors min "$DMG"
+hdiutil convert "$DMG" -format UDBZ -o "z$DMG"
+mv "z$DMG" "$DMG"
+hdiutil internet-enable "$DMG"
 # scp "$DMG" ainaz:web/nriley/software/
 :