epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Don't pass ftp user/pass on the commandline. openra user on the build machine has a .netrc setup with the correct credentials.

Browse Source
This commit is contained in:
Paul Chote
2011-02-08 15:54:59 +13:00
parent 5f8e2ccf5c
commit 627d275e84
3 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
packaging/checkout-and-build.sh
View File

@@ -1,9 +1,9 @@
#!/bin/bash #!/bin/bash
ARGS=3 ARGS=1
E_BADARGS=85 E_BADARGS=85
if [ $# -ne "$ARGS" ]; then if [ $# -ne "$ARGS" ]; then
echo "Usage: `basename $0` tag username password" echo "Usage: `basename $0` tag"
exit $E_BADARGS exit $E_BADARGS
fi fi
@@ -61,7 +61,7 @@ fi
./package-all.sh $TAG ~/openra-package/packages/ ./package-all.sh $TAG ~/openra-package/packages/
./upload-all.sh $TAG ~/openra-package/packages $2 $3 ./upload-all.sh $TAG ~/openra-package/packages
popd &> /dev/null # packaging popd &> /dev/null # packaging
popd &> /dev/null # $_gitname-build popd &> /dev/null # $_gitname-build

12
packaging/upload-all.sh
View File

@@ -10,17 +10,17 @@ LINUXVERSION=`echo $TAG | sed "s/-/\\./g"`
FTPPATHBASE="openra.res0l.net" FTPPATHBASE="openra.res0l.net"
FTPPATH="$FTPPATHBASE/assets/downloads" FTPPATH="$FTPPATHBASE/assets/downloads"
./uploader.sh windows $PKGDIR/OpenRA-$TAG.exe "$FTPSERVER" "$FTPPATH" "$3" "$4" ./uploader.sh windows $PKGDIR/OpenRA-$TAG.exe "$FTPSERVER" "$FTPPATH"
./uploader.sh mac $PKGDIR/OpenRA-$TAG.zip "$FTPSERVER" "$FTPPATH" "$3" "$4" ./uploader.sh mac $PKGDIR/OpenRA-$TAG.zip "$FTPSERVER" "$FTPPATH"
./uploader.sh linux/deb $PKGDIR/openra_${LINUXVERSION}_all.deb "$FTPSERVER" "$FTPPATH" "$3" "$4" ./uploader.sh linux/deb $PKGDIR/openra_${LINUXVERSION}_all.deb "$FTPSERVER" "$FTPPATH"
mv $PKGDIR/openra-$LINUXVERSION-1.noarch.rpm $PKGDIR/openra-$TYPE$VERSION-1.noarch.rpm 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" ./uploader.sh linux/rpm $PKGDIR/openra-$TYPE$VERSION-1.noarch.rpm "$FTPSERVER" "$FTPPATH"
mv $PKGDIR/openra-$LINUXVERSION-1-any.pkg.tar.xz $PKGDIR/openra-$TYPE$VERSION-1-any.pkg.tar.xz 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" ./uploader.sh linux/arch $PKGDIR/openra-$TYPE$VERSION-1-any.pkg.tar.xz "$FTPSERVER" "$FTPPATH"
if [ "$TYPE" = "release" ]; then if [ "$TYPE" = "release" ]; then
wput --basename=../ -u ../VERSION ftp://$3:$4@$FTPSERVER/$FTPPATHBASE/master/ wput --basename=../ -u ../VERSION ftp://$FTPSERVER/$FTPPATHBASE/master/
fi fi
wget http://$FTPSERVER/home/syncdownloads wget http://$FTPSERVER/home/syncdownloads

2
packaging/uploader.sh
View File

@@ -7,7 +7,7 @@ FILENAME=$2
FTPSERVER=$3 FTPSERVER=$3
FTPPATH=$4 FTPPATH=$4
FTP="ftp://$5:$6@${FTPSERVER}/${FTPPATH}/${PLATFORM}/" FTP="ftp://${FTPSERVER}/${FTPPATH}/${PLATFORM}/"
if [ ! -e "${FILENAME}" ]; then if [ ! -e "${FILENAME}" ]; then
echo "File not found: ${FILENAME}" echo "File not found: ${FILENAME}"