diff options
| author | Andrew Lewman <andrew@torproject.org> | 2006-07-18 04:37:43 +0000 |
|---|---|---|
| committer | Andrew Lewman <andrew@torproject.org> | 2006-07-18 04:37:43 +0000 |
| commit | 443b017d7fe116ab6e631476b9938b45f44c169a (patch) | |
| tree | 65ac749d7f927401239c7dcbe80674483ec100d7 | |
| parent | 13123187b3d26fb63394c9c49984661765e715bf (diff) | |
| download | tor-443b017d7fe116ab6e631476b9938b45f44c169a.tar.gz tor-443b017d7fe116ab6e631476b9938b45f44c169a.zip | |
Add the output of OSX arch into the package name in preparation for ppc
vs x86 packages.
svn:r6788
| -rw-r--r-- | trunk/contrib/osx/package.sh | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/trunk/contrib/osx/package.sh b/trunk/contrib/osx/package.sh index 0378346db7..9a85d12d03 100644 --- a/trunk/contrib/osx/package.sh +++ b/trunk/contrib/osx/package.sh @@ -25,12 +25,19 @@ PRIVOXY_PKG_ZIP=~/tmp/privoxyosx_setup_3.0.3.zip # http://developer.apple.com/documentation/DeveloperTools/Conceptual/SoftwareDistribution/index.html # man packagemaker -# Make sure VERSION is set, so we don't name the package "Tor--$OS-Bundle.dmg" +# Make sure VERSION is set, so we don't name the package +# "Tor--$OS-$ARCH-Bundle.dmg" if [ "XX$VERSION" = 'XX' ]; then echo "VERSION not set." exit 1 fi +if [ -x /usr/bin/arch ]; then + ARCH=`/usr/bin/arch` +else + ARCH="unknown" +fi + ## Determine OSX Version # map version to name if [ -x /usr/bin/sw_vers ]; then @@ -151,7 +158,7 @@ fi ### Assemble the metapackage. Packagemaker won't buld metapackages from # the command line, so we need to do it by hand. -MPKG=$BUILD_DIR/output/Tor-$VERSION-$OS-Bundle.mpkg +MPKG=$BUILD_DIR/output/Tor-$VERSION-$OS-$ARCH-Bundle.mpkg mkdir -p "$MPKG/Contents/Resources" echo -n "pmkrpkg1" > "$MPKG/Contents/PkgInfo" cp contrib/osx/ReadMe.rtf "$MPKG/Contents/Resources" @@ -178,10 +185,10 @@ cp LICENSE $BUILD_DIR/output/Tor\ License.txt find $BUILD_DIR/output -print0 | sudo xargs -0 chown root:wheel -mv $BUILD_DIR/output "$BUILD_DIR/Tor-$VERSION-$OS-Bundle" -rm -f "Tor-$VERSION-$OS-Bundle.dmg" +mv $BUILD_DIR/output "$BUILD_DIR/Tor-$VERSION-$OS-$ARCH-Bundle" +rm -f "Tor-$VERSION-$OS-$ARCH-Bundle.dmg" USER="`whoami`" -sudo hdiutil create -format UDZO -srcfolder "$BUILD_DIR/Tor-$VERSION-$OS-Bundle" "Tor-$VERSION-$OS-Bundle.dmg" -sudo chown "$USER" "Tor-$VERSION-$OS-Bundle.dmg" +sudo hdiutil create -format UDZO -srcfolder "$BUILD_DIR/Tor-$VERSION-$OS-$ARCH-Bundle" "Tor-$VERSION-$OS-$ARCH-Bundle.dmg" +sudo chown "$USER" "Tor-$VERSION-$OS-$ARCH-Bundle.dmg" sudo rm -rf $BUILD_DIR |