diff --git a/packaging/upload-all.sh b/packaging/upload-all.sh index 24e510a611..ecae481302 100755 --- a/packaging/upload-all.sh +++ b/packaging/upload-all.sh @@ -7,30 +7,24 @@ TYPE=`echo $TAG | grep -o "^[a-z]\\+"` VERSION=`echo $TAG | grep -o "[0-9]\\+-\\?[0-9]\\?"` FTPPATHBASE="openra.res0l.net" -case "$TYPE" in - "release") - FTPPATH="$FTPPATHBASE/releases" - ;; - "playtest") - FTPPATH="$FTPPATHBASE/playtests" - ;; - *) - msg "\E[31m" "Unrecognized tag prefix $TYPE" - exit 1 - ;; -esac +FTPPATH="$FTPPATHBASE/assets/downloads" -./uploader.sh windows "$VERSION" $PKGDIR/OpenRA-$VERSION.exe "latest" "$FTPSERVER" "$FTPPATH" "$3" "$4" -./uploader.sh mac "$VERSION" $PKGDIR/OpenRA-$VERSION.zip "latest" "$FTPSERVER" "$FTPPATH" "$3" "$4" +mv $PKGDIR/OpenRA-$VERSION.exe $PKGDIR/OpenRA-$TYPE$VERSION.exe +./uploader.sh windows $PKGDIR/OpenRA-$TYPE$VERSION.exe "$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"` -./uploader.sh linux "$VERSION" $PKGDIR/openra-$VERSION.deb "deblatest" "$FTPSERVER" "$FTPPATH" "$3" "$4" -./uploader.sh linux "$VERSION" $PKGDIR/openra-$LINUXVERSION-1.noarch.rpm "rpmlatest" "$FTPSERVER" "$FTPPATH" "$3" "$4" -./uploader.sh linux "$VERSION" $PKGDIR/openra-$LINUXVERSION-1-any.pkg.tar.xz "archlatest" "$FTPSERVER" "$FTPPATH" "$3" "$4" +mv $PKGDIR/openra-$VERSION.deb $PKGDIR/openra-$TYPE$VERSION.deb +./uploader.sh linux/deb $PKGDIR/openra-$TYPE$VERSION.deb "$FTPSERVER" "$FTPPATH" "$3" "$4" +mv $PKGDIR/openra-$LINUXVERSION-1.noarch.rpm $PKGDIR/openra-$TYPE$VERSION-1.noarch.rpm +./uploader.sh linux/rpm $PKGDIR/openra-$TYPE$VERSION-1.noarch.rpm "$FTPSERVER" "$FTPPATH" "$3" "$4" +mv $PKGDIR/openra-$LINUXVERSION-1-any.pkg.tar.xz $PKGDIR/openra-$TYPE$VERSION-1-any.pkg.tar.xz +./uploader.sh linux/arch $PKGDIR/openra-$TYPE$VERSION-1-any.pkg.tar.xz "$FTPSERVER" "$FTPPATH" "$3" "$4" if [ "$TYPE" = "release" ]; then wput --basename=../ -u ../VERSION ftp://$3:$4@$FTPSERVER/$FTPPATHBASE/master/ - cp ../VERSION ../srclatest.txt - wput --basename=../ -u ../srclatest.txt ftp://$3:$4@$FTPSERVER/$FTPPATH/linux/ fi + +wget http://$FTPSERVER/home/syncdownloads diff --git a/packaging/uploader.sh b/packaging/uploader.sh index e001fd2b2f..9952d2be1d 100755 --- a/packaging/uploader.sh +++ b/packaging/uploader.sh @@ -1,13 +1,11 @@ #!/bin/bash # OpenRA Package uploader script -# Usage: uploader.sh +# Usage: uploader.sh PLATFORM=$1 -VERSION=$2 -FILENAME=$3 -LATESTNAME=$4 -FTPSERVER=$5 -FTPPATH=$6 +FILENAME=$2 +FTPSERVER=$3 +FTPPATH=$4 FTP="ftp://$7:$8@${FTPSERVER}/${FTPPATH}/${PLATFORM}/" @@ -16,15 +14,6 @@ if [ ! -e "${FILENAME}" ]; then exit 1 fi -SIZE=`du -bh ${FILENAME} | cut -f1`B -mkdir -p /tmp/${PLATFORM}/ -echo -e "{\n\t\"version\":\"${VERSION}\",\n\t\"size\":\"${SIZE}\"\n}" > /tmp/${PLATFORM}/version.json -echo `basename ${FILENAME}` > /tmp/${PLATFORM}/${LATESTNAME}.txt - pushd `dirname ${FILENAME}` wput -u "${FTP}" "`basename ${FILENAME}`" popd -pushd /tmp/${PLATFORM} -wput -u "${FTP}" version.json -wput -u "${FTP}" ${LATESTNAME}.txt -popd