diff --git a/packaging/linux/buildpackage.sh b/packaging/linux/buildpackage.sh index 83ae7f0b29..d91bfc316b 100644 --- a/packaging/linux/buildpackage.sh +++ b/packaging/linux/buildpackage.sh @@ -53,6 +53,8 @@ cp -r hicolor $ROOTDIR/usr/share/icons/ fi ) & +if [ $4 = 'x86' ] +then ( echo "Building Arch-Linux package." cd pkgbuild @@ -61,6 +63,7 @@ cp -r hicolor $ROOTDIR/usr/share/icons/ echo "Arch-Linux package build failed, refer to $PWD/package.log." fi ) & +fi ( echo "Building RPM package." diff --git a/packaging/upload-all.sh b/packaging/upload-all.sh index 658c2ebbc0..a448a7e675 100755 --- a/packaging/upload-all.sh +++ b/packaging/upload-all.sh @@ -30,7 +30,6 @@ LINUXVERSION=`echo $VERSION | sed "s/-/\\./g"` ./uploader.sh linux "$VERSION" $PKGDIR/openra-$LINUXVERSION-1-i686.pkg.tar.xz "archlatest32" "$FTPSERVER" "$FTPPATH" "$3" "$4" ./uploader.sh linux "$VERSION" $PKGDIR/openra-$VERSION-amd64.deb "deblatest" "$FTPSERVER" "$FTPPATH" "$3" "$4" ./uploader.sh linux "$VERSION" $PKGDIR/openra-$LINUXVERSION-1.x86_64.rpm "rpmlatest" "$FTPSERVER" "$FTPPATH" "$3" "$4" -./uploader.sh linux "$VERSION" $PKGDIR/openra-$LINUXVERSION-1-x86_64.pkg.tar.xz "archlatest" "$FTPSERVER" "$FTPPATH" "$3" "$4" if [ "$TYPE" = "release" ]; then wput --basename=../ -u ../VERSION ftp://$3:$4@$FTPSERVER/$FTPPATHBASE/master/