Remove unnecessary renaming of windows and mac packages.

This commit is contained in:
Paul Chote
2011-02-08 14:18:46 +13:00
parent 5f6dd59743
commit 501155da0d
3 changed files with 5 additions and 7 deletions

View File

@@ -2,7 +2,7 @@
# OpenRA packaging script for Mac OSX # OpenRA packaging script for Mac OSX
if [ $# -ne "3" ]; then if [ $# -ne "3" ]; then
echo "Usage: `basename $0` version files-dir outputdir" echo "Usage: `basename $0` tag files-dir outputdir"
exit 1 exit 1
fi fi

View File

@@ -59,7 +59,7 @@ echo "Creating packages..."
cd windows cd windows
makensis -DSRCDIR="$BUILTDIR" OpenRA.nsi &> package.log makensis -DSRCDIR="$BUILTDIR" OpenRA.nsi &> package.log
if [ $? -eq 0 ]; then if [ $? -eq 0 ]; then
mv OpenRA.exe "$OUTPUTDIR"/OpenRA-$VERSION.exe mv OpenRA.exe "$OUTPUTDIR"/OpenRA-$TAG.exe
else else
echo "Windows package build failed, refer to windows/package.log." echo "Windows package build failed, refer to windows/package.log."
fi fi
@@ -67,7 +67,7 @@ echo "Creating packages..."
( (
cd osx cd osx
sh buildpackage.sh "$VERSION" "$BUILTDIR" "$OUTPUTDIR" &> package.log sh buildpackage.sh "$TAG" "$BUILTDIR" "$OUTPUTDIR" &> package.log
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
echo "OSX package build failed, refer to osx/package.log." echo "OSX package build failed, refer to osx/package.log."
fi fi

View File

@@ -9,10 +9,8 @@ FTPPATHBASE="openra.res0l.net"
FTPPATH="$FTPPATHBASE/assets/downloads" FTPPATH="$FTPPATHBASE/assets/downloads"
mv $PKGDIR/OpenRA-$VERSION.exe $PKGDIR/OpenRA-$TYPE$VERSION.exe ./uploader.sh windows $PKGDIR/OpenRA-$TAG.exe "$FTPSERVER" "$FTPPATH" "$3" "$4"
./uploader.sh windows $PKGDIR/OpenRA-$TYPE$VERSION.exe "$FTPSERVER" "$FTPPATH" "$3" "$4" ./uploader.sh mac $PKGDIR/OpenRA-$TAG.zip "$FTPSERVER" "$FTPPATH" "$3" "$4"
mv $PKGDIR/OpenRA-$VERSION.zip $PKGDIR/OpenRA-$TYPE$VERSION.zip
./uploader.sh mac $PKGDIR/OpenRA-$TYPE$VERSION.zip "$FTPSERVER" "$FTPPATH" "$3" "$4"
LINUXVERSION=`echo $VERSION | sed "s/-/\\./g"` LINUXVERSION=`echo $VERSION | sed "s/-/\\./g"`