diff --git a/packaging/linux/pkgbuild/openra.install b/packaging/linux/pkgbuild/openra.install index f536942333..7c2a417548 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/packages/ra-packages.php + wget "http://open-ra.org/get-dependency.php?file=ra" 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.php + wget "http://open-ra.org/get-dependency.php?file=cnc" 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 435ddb0b81..2bfdc53f48 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/packages/ra-packages.php + wget "http://open-ra.org/get-dependency.php?file=ra" 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/packages/cnc-packages.php + wget "http://open-ra.org/get-dependency.php?file=cnc" 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 a16c7b4a8a..ba67f69a52 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/releases/mac/osx-deps-v2.zip" +DEPS_URL="http://open-ra.org/get-dependency.php?file=osx" RA_PACKAGE="ra-packages.zip" -RA_URL="http://open-ra.org/packages/ra-packages.php" +RA_URL="http://open-ra.org/get-dependency.php?file=ra" CNC_PACKAGE="cnc-packages.zip" -CNC_URL="http://open-ra.org/packages/cnc-packages.php" +CNC_URL="http://open-ra.org/get-dependency.php?file=cnc" cd "$EXE_PATH" diff --git a/packaging/windows/OpenRA.nsi b/packaging/windows/OpenRA.nsi index 73eb3d89db..e825d7bb6c 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/packages/ra-packages.php ra-packages.zip + NSISdl::download "http://open-ra.org/get-dependency.php?file=ra" 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/packages/cnc-packages.php cnc-packages.zip + NSISdl::download "http://open-ra.org/get-dependency.php?file=cnc" cnc-packages.zip Pop $R0 StrCmp $R0 "success" +2 Abort @@ -169,7 +169,7 @@ Section "-Freetype" Freetype SetOutPath "$TEMP" IfFileExists $INSTDIR\zlib1.dll done installfreetype installfreetype: - NSISdl::download http://www.open-ra.org/releases/windows/freetype-zlib.zip freetype-zlib.zip + NSISdl::download "http://open-ra.org/get-dependency.php?file=freetype" freetype-zlib.zip Pop $R0 StrCmp $R0 "success" +2 Abort @@ -182,7 +182,7 @@ Section "-Cg" Cg SetOutPath "$TEMP" IfFileExists $INSTDIR\cg.dll done installcg installcg: - NSISdl::download http://www.open-ra.org/releases/windows/cg-win32.zip cg-win32.zip + NSISdl::download "http://open-ra.org/get-dependency.php?file=cg" cg-win32.zip Pop $R0 StrCmp $R0 "success" +2 Abort diff --git a/web/get-dependency.php b/web/get-dependency.php new file mode 100644 index 0000000000..7c02efcbaf --- /dev/null +++ b/web/get-dependency.php @@ -0,0 +1,30 @@ + diff --git a/web/packages/cnc-mirrors.txt b/web/packages/cnc-mirrors.txt index 939cfe2c00..9bcf448254 100644 --- a/web/packages/cnc-mirrors.txt +++ b/web/packages/cnc-mirrors.txt @@ -1,3 +1,4 @@ http://metahash.com/packages/cnc-packages.zip http://openra.res0l.net/packages/cnc-packages.zip http://open-ra.org/packages/cnc-packages.zip +http://mirumu.jp/pub/packages/cnc-packages.zip diff --git a/web/packages/cnc-packages.php b/web/packages/cnc-packages.php deleted file mode 100644 index ee38e73427..0000000000 --- a/web/packages/cnc-packages.php +++ /dev/null @@ -1,8 +0,0 @@ - diff --git a/web/packages/ra-mirrors.txt b/web/packages/ra-mirrors.txt index ec08011fb1..7e83fec25e 100644 --- a/web/packages/ra-mirrors.txt +++ b/web/packages/ra-mirrors.txt @@ -1,3 +1,4 @@ http://metahash.com/packages/ra-packages.zip http://openra.res0l.net/packages/ra-packages.zip http://open-ra.org/packages/ra-packages.zip +http://mirumu.jp/pub/packages/ra-packages.zip diff --git a/web/packages/ra-packages.php b/web/packages/ra-packages.php deleted file mode 100644 index 72e9257688..0000000000 --- a/web/packages/ra-packages.php +++ /dev/null @@ -1,8 +0,0 @@ - diff --git a/web/releases/mac/osx-dependencies-mirrors.txt b/web/releases/mac/osx-dependencies-mirrors.txt new file mode 100644 index 0000000000..5e3d9ced9a --- /dev/null +++ b/web/releases/mac/osx-dependencies-mirrors.txt @@ -0,0 +1,4 @@ +http://open-ra.org/releases/mac/osx-deps-v2.zip +http://openra.res0l.net/releases/mac/osx-deps-v2.zip +http://metahash.com/releases/mac/osx-deps-v2.zip +http://mirumu.jp/pub/releases/mac/osx-deps-v2.zip \ No newline at end of file diff --git a/web/releases/windows/cg-mirrors.txt b/web/releases/windows/cg-mirrors.txt new file mode 100644 index 0000000000..659d20a70e --- /dev/null +++ b/web/releases/windows/cg-mirrors.txt @@ -0,0 +1,4 @@ +http://open-ra.org/releases/windows/cg-win32.zip +http://openra.res0l.net/releases/windows/cg-win32.zip +http://metahash.com/releases/windows/cg-win32.zip +http://mirumu.jp/pub/releases/windows/cg-win32.zip \ No newline at end of file diff --git a/web/releases/windows/freetype-mirrors.txt b/web/releases/windows/freetype-mirrors.txt new file mode 100644 index 0000000000..0204c6474e --- /dev/null +++ b/web/releases/windows/freetype-mirrors.txt @@ -0,0 +1,4 @@ +http://open-ra.org/releases/windows/freetype-zlib.zip +http://openra.res0l.net/releases/windows/freetype-zlib.zip +http://metahash.com/releases/windows/freetype-zlib.zip +http://mirumu.jp/pub/releases/windows/freetype-zlib.zip \ No newline at end of file