diff --git a/packaging/linux/deb/DEBIAN/control b/packaging/linux/deb/DEBIAN/control index c9d88b96eb..602158a5f2 100644 --- a/packaging/linux/deb/DEBIAN/control +++ b/packaging/linux/deb/DEBIAN/control @@ -1,6 +1,6 @@ Package: openra Version: 20100914 -Architecture: i386 +Architecture: all Maintainer: Matthew Bowra-Dean Uploaders: Maikel van den Hout Installed-Size: 8306 @@ -10,6 +10,5 @@ Priority: extra Homepage: http://www.open-ra.org/ Description: A multiplayer reimplementation of the Command & Conquer: Red Alert game engine in .NET/Mono, OpenGL, OpenAL and SDL. Has extensive modding support and includes Command & Conquer as an official mod. . - Please note: OpenRA is currently at an alpha release stage. Expect releases to be buggy - or unstable. If you have any problems, please report them to the IRC channel (#openra on + Please note: OpenRA is currently at an alpha release stage. If you have any problems, please report them to the IRC channel (#openra on irc.freenode.net) or the bug-tracker (http://red-bull.ijw.co.nz:3690/OpenRA). diff --git a/packaging/linux/deb/DEBIAN/postinst b/packaging/linux/deb/DEBIAN/postinst index f09fd83b9f..c9e26ef583 100755 --- a/packaging/linux/deb/DEBIAN/postinst +++ b/packaging/linux/deb/DEBIAN/postinst @@ -7,16 +7,11 @@ fi # End automatically added section start_directory=$( pwd ) -cd /tmp +cd /usr/share/openra anw=`zenity --question --text "Download and install RA packages?"; echo $?` if [ $anw = 0 ] ; then - cd /tmp/ - wget "http://open-ra.org/get-dependency.php?file=ra-packages" -O ra-packages.zip - mkdir -p /usr/share/openra/mods/ra/packages - unzip -f ra-packages.zip -d /usr/share/openra/mods/ra/packages - rm ra-packages.zip - cd $start_directory + mono OpenRA.Utility.exe --download-packages=ra else zenity --info --text "The RA packages will need to be manually extracted from http://open-ra.org/get-dependency.php?file=ra-packages \ to /usr/share/openra/mods/ra/packages before the RA mod will work." @@ -26,20 +21,17 @@ fi anw=`zenity --question --text "Download and install C&C packages?"; echo $?` if [ $anw = 0 ] ; then - cd /tmp/ - wget "http://open-ra.org/get-dependency.php?file=cnc-packages" -O cnc-packages.zip - mkdir -p /usr/share/openra/mods/cnc/packages - unzip -f cnc-packages.zip -d usr/share/openra/mods/cnc/packages - rm cnc-packages.zip - cd $start_directory + mono OpenRA.Utility.exe --download-packages=cnc else zenity --info --text "The C&C packages will need to be manually extracted from http://open-ra.org/get-dependency.php?file=cnc-packages \ to /usr/share/openra/mods/cnc/packages before the C&C mod will work." break fi -gacutil -i /usr/share/openra/thirdparty/Tao/Tao.Cg.dll -gacutil -i /usr/share/openra/thirdparty/Tao/Tao.FreeType.dll -gacutil -i /usr/share/openra/thirdparty/Tao/Tao.OpenAl.dll -gacutil -i /usr/share/openra/thirdparty/Tao/Tao.OpenGl.dll -gacutil -i /usr/share/openra/thirdparty/Tao/Tao.Sdl.dll +gacutil -i thirdparty/Tao/Tao.Cg.dll +gacutil -i thirdparty/Tao/Tao.FreeType.dll +gacutil -i thirdparty/Tao/Tao.OpenAl.dll +gacutil -i thirdparty/Tao/Tao.OpenGl.dll +gacutil -i thirdparty/Tao/Tao.Sdl.dll + +cd $start_directory diff --git a/packaging/linux/pkgbuild/openra.install b/packaging/linux/pkgbuild/openra.install index 70e1b2ef3a..d5ba7a4c4e 100644 --- a/packaging/linux/pkgbuild/openra.install +++ b/packaging/linux/pkgbuild/openra.install @@ -1,31 +1,15 @@ - -install_ra_packages() { - wget "http://open-ra.org/get-dependency.php?file=ra-packages" - mkdir -p $pkgdir/usr/share/openra/mods/ra/packages - unzip ra-packages.zip -d $pkgdir/usr/share/openra/mods/ra/packages - rm ra-packages.zip -} - -install_cnc_packages() { - wget "http://open-ra.org/get-dependency.php?file=cnc-packages" - mkdir -p $pkgdir/usr/share/openra/mods/cnc/packages - unzip cnc-packages.zip -d $pkgdir/usr/share/openra/mods/cnc/packages - rm cnc-packages.zip -} - # arg 1: the new package version post_install() { + cd $pkgdir/usr/share/openra while true do read -s -n1 -p "Download and install RA packages? [Y/n]" case $REPLY in y|Y|"") - pushd /tmp/ - install_ra_packages - popd + mono OpenRA.Utility.exe --download-packages=ra break;; n|N) - echo "The RA packages will need to be manually extracted from http://open-ra.org/get-dependency.php?file=ra-packages \ + echo "The RA packages will need to be manually extracted from http://open-ra.org/get-dependency.php?file=ra-packages \ to /usr/share/openra/mods/ra/packages before the RA mod will work." break;; *) echo "Please enter y or n.";; @@ -37,21 +21,19 @@ post_install() { read -s -n1 -p "Download and install C&C packages? [Y/n]" case $REPLY in y|Y|"") - pushd /tmp/ - install_cnc_packages - popd + mono OpenRA.Utility.exe --download-packages=cnc break;; n|N) - echo "The C&C packages will need to be manually extracted from http://open-ra.org/get-dependency.php?file=cnc-packages \ + echo "The C&C packages will need to be manually extracted from http://open-ra.org/get-dependency.php?file=cnc-packages \ to /usr/share/openra/mods/cnc/packages before the C&C mod will work." break;; *) echo "Please enter y or n.";; esac done - gacutil -i $pkgdir/usr/share/openra/thirdparty/Tao/Tao.Cg.dll - gacutil -i $pkgdir/usr/share/openra/thirdparty/Tao/Tao.FreeType.dll - gacutil -i $pkgdir/usr/share/openra/thirdparty/Tao/Tao.OpenAl.dll - gacutil -i $pkgdir/usr/share/openra/thirdparty/Tao/Tao.OpenGl.dll - gacutil -i $pkgdir/usr/share/openra/thirdparty/Tao/Tao.Sdl.dll + gacutil -i thirdparty/Tao/Tao.Cg.dll + gacutil -i thirdparty/Tao/Tao.FreeType.dll + gacutil -i thirdparty/Tao/Tao.OpenAl.dll + gacutil -i thirdparty/Tao/Tao.OpenGl.dll + gacutil -i thirdparty/Tao/Tao.Sdl.dll } diff --git a/packaging/linux/rpm/openra.spec b/packaging/linux/rpm/openra.spec index 24a081bdbf..c1d20b0b3b 100644 --- a/packaging/linux/rpm/openra.spec +++ b/packaging/linux/rpm/openra.spec @@ -28,18 +28,13 @@ cp -r ~/openra-package/built/ $RPM_BUILD_ROOT rm -rf $RPM_BUILD_ROOT %post -cd /tmp +cd $RPM_BUILD_ROOT/usr/share/openra while true do read -s -n1 -p "Download and install RA packages? [Y/n]" case $REPLY in y|Y|"") - pushd /tmp/ - wget "http://open-ra.org/get-dependency.php?file=ra-packages" -O ra-packages.zip - mkdir -p $RPM_BUILD_ROOT/usr/share/openra/mods/ra/packages - unzip ra-packages.zip -d $RPM_BUILD_ROOT/usr/share/openra/mods/ra/packages - rm ra-packages.zip - popd + mono OpenRA.Utility.exe --download-packages=ra break;; n|N) echo "The RA packages will need to be manually extracted from http://open-ra.org/get-dependency.php?file=ra-packages \ @@ -54,12 +49,7 @@ do read -s -n1 -p "Download and install C&C packages? [Y/n]" case $REPLY in y|Y|"") - pushd /tmp/ - wget "http://open-ra.org/get-dependency.php?file=cnc-packages" -O cnc-packages.zip - mkdir -p $RPM_BUILD_ROOT/usr/share/openra/mods/cnc/packages - unzip cnc-packages.zip -d $RPM_BUILD_ROOT/usr/share/openra/mods/cnc/packages - rm cnc-packages.zip - popd + mono OpenRA.Utility.exe --download-packages=cnc break;; n|N) echo "The C&C packages will need to be manually extracted from http://open-ra.org/get-dependency.php?file=cnc-packages \ @@ -69,11 +59,11 @@ do esac done -gacutil -i $RPM_BUILD_ROOT/usr/share/openra/thirdparty/Tao/Tao.Cg.dll -gacutil -i $RPM_BUILD_ROOT/usr/share/openra/thirdparty/Tao/Tao.FreeType.dll -gacutil -i $RPM_BUILD_ROOT/usr/share/openra/thirdparty/Tao/Tao.OpenAl.dll -gacutil -i $RPM_BUILD_ROOT/usr/share/openra/thirdparty/Tao/Tao.OpenGl.dll -gacutil -i $RPM_BUILD_ROOT/usr/share/openra/thirdparty/Tao/Tao.Sdl.dll +gacutil -i thirdparty/Tao/Tao.Cg.dll +gacutil -i thirdparty/Tao/Tao.FreeType.dll +gacutil -i thirdparty/Tao/Tao.OpenAl.dll +gacutil -i thirdparty/Tao/Tao.OpenGl.dll +gacutil -i thirdparty/Tao/Tao.Sdl.dll %files /usr/bin/openra