nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-30 15:43:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

Remove the OS variable, because we don't need it, just the ARCH.

Browse Source 
svn:r16678
This commit is contained in:
Andrew Lewman 2008-08-28 01:27:34 +00:00
parent 6bf1dec945
commit d79537a806
2 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
contrib/osx/Tor
View File

@ -25,13 +25,13 @@ if [ -x /usr/bin/sw_vers ]; then
# the OS version # the OS version
OSVER=`/usr/bin/sw_vers | grep ProductVersion | cut -f2 | cut -d"." -f1,2` OSVER=`/usr/bin/sw_vers | grep ProductVersion | cut -f2 | cut -d"." -f1,2`
case "$OSVER" in case "$OSVER" in
"10.6") OS="snowleopard" ARCH="universal";; "10.6") ARCH="universal";;
"10.5") OS="leopard" ARCH="universal";; "10.5") ARCH="universal";;
"10.4") OS="tiger" ARCH="universal";; "10.4") ARCH="universal";;
"10.3") OS="panther" ARCH="ppc";; "10.3") ARCH="ppc";;
"10.2") OS="jaguar" ARCH="ppc";; "10.2") ARCH="ppc";;
"10.1") OS="puma" ARCH="ppc";; "10.1") ARCH="ppc";;
"10.0") OS="cheetah" ARCH="ppc";; "10.0") ARCH="ppc";;
esac esac
else else
OS="unknown" OS="unknown"

28
contrib/osx/package.sh
View File

@ -35,17 +35,17 @@ if [ -x /usr/bin/sw_vers ]; then
# the OS version # the OS version
OSVER=`/usr/bin/sw_vers | grep ProductVersion | cut -f2 | cut -d"." -f1,2` OSVER=`/usr/bin/sw_vers | grep ProductVersion | cut -f2 | cut -d"." -f1,2`
case "$OSVER" in case "$OSVER" in
"10.6") OS="snowleopard" ARCH="universal";; "10.6") ARCH="universal";;
"10.5") OS="leopard" ARCH="universal";; "10.5") ARCH="universal";;
"10.4") OS="tiger" ARCH="universal";; "10.4") ARCH="universal";;
"10.3") OS="panther" ARCH="ppc";; "10.3") ARCH="ppc";;
"10.2") OS="jaguar" ARCH="ppc";; "10.2") ARCH="ppc";;
"10.1") OS="puma" ARCH="ppc";; "10.1") ARCH="ppc";;
"10.0") OS="cheetah" ARCH="ppc";; "10.0") ARCH="ppc";;
*) OS="unknown";; *) ARCH="unknown";;
esac esac
else else
OS="unknown" ARCH="unknown"
fi fi
# Where will we put our temporary files? # Where will we put our temporary files?
@ -132,7 +132,7 @@ $PACKAGEMAKER -build \
### Assemble the metapackage. Packagemaker won't buld metapackages from ### Assemble the metapackage. Packagemaker won't buld metapackages from
# the command line, so we need to do it by hand. # the command line, so we need to do it by hand.
MPKG=$BUILD_DIR/output/Tor-$VERSION-$OS-$ARCH-Bundle.mpkg MPKG=$BUILD_DIR/output/Tor-$VERSION-$ARCH-Bundle.mpkg
mkdir -p "$MPKG/Contents/Resources" mkdir -p "$MPKG/Contents/Resources"
echo -n "pmkrpkg1" > "$MPKG/Contents/PkgInfo" echo -n "pmkrpkg1" > "$MPKG/Contents/PkgInfo"
cp contrib/osx/ReadMe.rtf "$MPKG/Contents/Resources" cp contrib/osx/ReadMe.rtf "$MPKG/Contents/Resources"
@ -154,10 +154,10 @@ cp LICENSE $BUILD_DIR/output/Tor\ License.txt
find $BUILD_DIR/output -print0 | sudo xargs -0 chown root:wheel find $BUILD_DIR/output -print0 | sudo xargs -0 chown root:wheel
mv $BUILD_DIR/output "$BUILD_DIR/Tor-$VERSION-$OS-$ARCH-Bundle" mv $BUILD_DIR/output "$BUILD_DIR/Tor-$VERSION-$ARCH-Bundle"
rm -f "Tor-$VERSION-$OS-$ARCH-Bundle.dmg" rm -f "Tor-$VERSION-$ARCH-Bundle.dmg"
USER="`whoami`" USER="`whoami`"
sudo hdiutil create -format UDZO -srcfolder "$BUILD_DIR/Tor-$VERSION-$OS-$ARCH-Bundle" "Tor-$VERSION-$OS-$ARCH-Bundle.dmg" sudo hdiutil create -format UDZO -srcfolder "$BUILD_DIR/Tor-$VERSION-$ARCH-Bundle" "Tor-$VERSION-$ARCH-Bundle.dmg"
sudo chown "$USER" "Tor-$VERSION-$OS-$ARCH-Bundle.dmg" sudo chown "$USER" "Tor-$VERSION-$ARCH-Bundle.dmg"
sudo rm -rf $BUILD_DIR sudo rm -rf $BUILD_DIR