Fixed upload scripts.

packaging/checkout-and-build.sh

@@ -53,15 +53,6 @@ if [ $? -ne 0 ]; then
     exit 1
 fi
 
-#echo $TAG > "VERSION"
-
-#msg "\E[32m" "Starting make..."
-#make prefix=/usr DESTDIR=../built install
-#if [ $? -ne 0 ]; then
-#    msg "\E[31m" "Build failed."
-#    exit 1
-#fi
-
 pushd packaging &> /dev/null
 
 if [ ! -d ~/openra-package/packages/ ] ; then
@@ -70,6 +61,8 @@ fi
 
 ./package-all.sh $VERSION ~/openra-package/packages/
 
+./upload-all.sh $TAG ~/openra-package/packages/
+
 popd &> /dev/null # packaging
 popd &> /dev/null # $_gitname-build
 popd &> /dev/null # ~/openra-package/

packaging/upload-all.sh

@@ -1,16 +1,18 @@
 #!/bin/bash
 FTPSERVER=openra.res0l.net
 TAG=$1
+PKGDIR=$2
 
 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="openra.res0l.net/releases"
+        FTPPATH="$FTPPATHBASE/releases"
         ;;
     "playtest") 
-        FTPPATH="openra.res0l.net/playtests"
+        FTPPATH="$FTPPATHBASE/playtests"
         ;;
     *)
         msg "\E[31m" "Unrecognized tag prefix $TYPE"
@@ -18,9 +20,17 @@ case "$TYPE" in
         ;;
 esac
 
-uploader.sh windows "$VERSION" OpenRA-$VERSION.exe "$FTPPATH" "$2" "$3"
+uploader.sh windows "$VERSION" $PKGDIR/OpenRA-$VERSION.exe "latest" "$FTPPATH" "$3" "$4"
-uploader.sh mac "$VERSION" OpenRA-$VERSION.zip "$FTPPATH" "$2" "$3"
+uploader.sh mac "$VERSION" $PKGDIR/OpenRA-$VERSION.zip "latest" "$FTPPATH" "$3" "$4"
+
+LINUXVERSION=`echo $VERSION | sed "s/-/\\./g"`
+
+uploader.sh linux "$VERSION" $PKGDIR/openra-$LINUXVERSION.deb "deblatest" "$FTPPATH" "$3" "$4"
+uploader.sh linux "$VERSION" $PKGDIR/openra-$LINUXVERSION-1.noarch.rpm "rpmlatest" "$FTPPATH" "$3" "$4"
+uploader.sh linux "$VERSION" $PKGDIR/openra-$LINUXVERSION-1-any.pkg.tar.xz "archlatest" "$FTPPATH" "$3" "$4"
 
 if [ "$TYPE" = "release" ]; then
-    wput --basename=../ -u ../VERSION ftp://$2:$3@$FTPSERVER/$FTPPATH/master/
+    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

packaging/uploader.sh

@@ -5,9 +5,10 @@
 PLATFORM=$1
 VERSION=$2
 FILENAME=$3
-FTPPATH=$4
+LATESTNAME=$4
+FTPPATH=$5
 
-FTP="ftp://$5:$6@${FTPSERVER}/${FTPPATH}/${PLATFORM}/"
+FTP="ftp://$6:$7@${FTPSERVER}/${FTPPATH}/${PLATFORM}/"
 
 if [ ! -e "${FILENAME}" ]; then
 	echo "File not found: ${FILENAME}"
@@ -17,12 +18,12 @@ 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}/latest.txt
+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}" latest.txt
+wput -u "${FTP}" ${LATESTNAME}.txt
 popd