diff --git a/packaging/linux/pkgbuild/openra.install b/packaging/linux/pkgbuild/openra.install index c7ccf504a6..f2317d173c 100644 --- a/packaging/linux/pkgbuild/openra.install +++ b/packaging/linux/pkgbuild/openra.install @@ -3,12 +3,14 @@ install_ra_packages() { wget http://open-ra.org/packages/ra-packages.zip 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/packages/cnc-packages.zip mkdir -p $pkgdir/usr/share/openra/mods/cnc/packages unzip ra-packages.zip -d $pkgdir/usr/share/openra/mods/cnc/packages + rm ra-packages.zip } # arg 1: the new package version @@ -42,9 +44,4 @@ post_install() { 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 - - echo "#!/bin/sh" > openra - echo "cd /usr/share/openra" >> openra - echo "mono /usr/share/openra/OpenRA.Game.exe" >> openra - install -m +rx openra /usr/bin/ } diff --git a/packaging/linux/rpm/openra.spec b/packaging/linux/rpm/openra.spec index 2a0f5604e7..05666b2fba 100644 --- a/packaging/linux/rpm/openra.spec +++ b/packaging/linux/rpm/openra.spec @@ -42,6 +42,7 @@ do wget http://open-ra.org/packages/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 break;; n|N) break;; *) echo "Please enter y or n.";; @@ -56,6 +57,7 @@ do wget http://open-ra.org/packages/cnc-packages.zip mkdir -p $RPM_BUILD_ROOT/usr/share/openra/mods/cnc/packages unzip ra-packages.zip -d $RPM_BUILD_ROOT/usr/share/openra/mods/cnc/packages + rm ra-packages.zip break;; n|N) break;; *) echo "Please enter y or n.";; @@ -68,12 +70,8 @@ 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 -echo "#!/bin/sh" > openra -echo "cd $RPM_BUILD_ROOT/usr/share/openra" >> openra -echo "mono $RPM_BUILD_ROOT/usr/share/openra/OpenRA.Game.exe" >> openra -install -m +rx openra $RPM_BUILD_ROOT/usr/bin/ - %files +/usr/bin/openra /usr/share/openra/*.exe /usr/share/openra/*.ttf /usr/share/openra/*.dll @@ -81,6 +79,3 @@ install -m +rx openra $RPM_BUILD_ROOT/usr/bin/ /usr/share/openra/shaders/ /usr/share/openra/mods/ /usr/share/openra/thirdparty/ - -%postun -rm $(RPM_BUILD_ROOT)/usr/bin/openra