diff --git a/packaging/linux/pkgbuild/openra.install b/packaging/linux/pkgbuild/openra.install index 7c2a417548..21a8d2128d 100644 --- a/packaging/linux/pkgbuild/openra.install +++ b/packaging/linux/pkgbuild/openra.install @@ -1,13 +1,13 @@ install_ra_packages() { - wget "http://open-ra.org/get-dependency.php?file=ra" + 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" + 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 diff --git a/packaging/linux/rpm/openra.spec b/packaging/linux/rpm/openra.spec index 2bfdc53f48..07aef4deb8 100644 --- a/packaging/linux/rpm/openra.spec +++ b/packaging/linux/rpm/openra.spec @@ -35,7 +35,7 @@ do case $REPLY in y|Y|"") pushd /tmp/ - wget "http://open-ra.org/get-dependency.php?file=ra" + wget "http://open-ra.org/get-dependency.php?file=ra-packages" 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 @@ -52,7 +52,7 @@ do case $REPLY in y|Y|"") pushd /tmp/ - wget "http://open-ra.org/get-dependency.php?file=cnc" + wget "http://open-ra.org/get-dependency.php?file=cnc-packages" 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 diff --git a/packaging/osx/OpenRA.app/Contents/MacOS/OpenRA b/packaging/osx/OpenRA.app/Contents/MacOS/OpenRA index ba67f69a52..11e04290fe 100755 --- a/packaging/osx/OpenRA.app/Contents/MacOS/OpenRA +++ b/packaging/osx/OpenRA.app/Contents/MacOS/OpenRA @@ -19,11 +19,11 @@ SUPPORT_PATH=~/Library/"Application Support"/OpenRA # Downloadable content DEPS_PACKAGE="osx-deps-v2.zip" -DEPS_URL="http://open-ra.org/get-dependency.php?file=osx" +DEPS_URL="http://open-ra.org/get-dependency.php?file=osx-deps-v2" RA_PACKAGE="ra-packages.zip" -RA_URL="http://open-ra.org/get-dependency.php?file=ra" +RA_URL="http://open-ra.org/get-dependency.php?file=ra-packages" CNC_PACKAGE="cnc-packages.zip" -CNC_URL="http://open-ra.org/get-dependency.php?file=cnc" +CNC_URL="http://open-ra.org/get-dependency.php?file=cnc-packages" cd "$EXE_PATH" diff --git a/packaging/windows/OpenRA.nsi b/packaging/windows/OpenRA.nsi index e825d7bb6c..a0728d45d5 100644 --- a/packaging/windows/OpenRA.nsi +++ b/packaging/windows/OpenRA.nsi @@ -105,7 +105,7 @@ SectionGroup /e "Mods" IfFileExists "$INSTDIR\mods\ra\packages\redalert.mix" done dlcontent dlcontent: SetOutPath "$OUTDIR\packages" - NSISdl::download "http://open-ra.org/get-dependency.php?file=ra" ra-packages.zip + NSISdl::download "http://open-ra.org/get-dependency.php?file=ra-packages" ra-packages.zip Pop $R0 StrCmp $R0 "success" +2 Abort @@ -126,7 +126,7 @@ SectionGroup /e "Mods" IfFileExists "$INSTDIR\mods\cnc\packages\conquer.mix" done dlcontent dlcontent: SetOutPath "$OUTDIR\packages" - NSISdl::download "http://open-ra.org/get-dependency.php?file=cnc" cnc-packages.zip + NSISdl::download "http://open-ra.org/get-dependency.php?file=cnc-packages" cnc-packages.zip Pop $R0 StrCmp $R0 "success" +2 Abort diff --git a/web/get-dependency.php b/web/get-dependency.php index 7c02efcbaf..a67e98b22b 100644 --- a/web/get-dependency.php +++ b/web/get-dependency.php @@ -2,13 +2,13 @@ $mirrors_file = ""; switch ($_GET["file"]) { - case "ra": + case "ra-packages": $mirrors_file = "packages/ra-mirrors.txt"; break; - case "cnc": + case "cnc-packages": $mirrors_file = "packages/cnc-mirrors.txt"; break; - case "osx": + case "osx-deps-v2": $mirrors_file = "releases/mac/osx-dependencies-mirrors.txt"; break; case "freetype":