diff --git a/Makefile b/Makefile index fc47daab80..52cd516547 100644 --- a/Makefile +++ b/Makefile @@ -123,8 +123,8 @@ install: all @$(INSTALL_PROGRAM) -m +rx openra $(BIN_INSTALL_DIR) @echo "OpenRA is now installed. You will now want to download" - @echo "http://open-ra.org/packages/ra-packages.zip and" - @echo "http://open-ra.org/packages/cnc-packages.zip" + @echo "http://open-ra.org/packages/ra-packages.php and" + @echo "http://open-ra.org/packages/cnc-packages.php" @echo "and extract their contents to" @echo "$(INSTALL_DIR)/mods/ra/packages and " @echo "$(INSTALL_DIR)/mods/cnc/packages respectively." diff --git a/packaging/linux/pkgbuild/openra.install b/packaging/linux/pkgbuild/openra.install index 9d1a8da9fb..f536942333 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.zip + wget http://open-ra.org/packages/ra-packages.php 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 + wget http://open-ra.org/packages/cnc-packages.php 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 5ac0396112..435ddb0b81 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.zip + wget http://open-ra.org/packages/ra-packages.php 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.zip + wget http://open-ra.org/packages/cnc-packages.php 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 ff3f4d8431..a16c7b4a8a 100755 --- a/packaging/osx/OpenRA.app/Contents/MacOS/OpenRA +++ b/packaging/osx/OpenRA.app/Contents/MacOS/OpenRA @@ -21,9 +21,9 @@ SUPPORT_PATH=~/Library/"Application Support"/OpenRA DEPS_PACKAGE="osx-deps-v2.zip" DEPS_URL="http://open-ra.org/releases/mac/osx-deps-v2.zip" RA_PACKAGE="ra-packages.zip" -RA_URL="http://open-ra.org/packages/ra-packages.zip" +RA_URL="http://open-ra.org/packages/ra-packages.php" CNC_PACKAGE="cnc-packages.zip" -CNC_URL="http://open-ra.org/packages/cnc-packages.zip" +CNC_URL="http://open-ra.org/packages/cnc-packages.php" cd "$EXE_PATH" diff --git a/packaging/windows/OpenRA.nsi b/packaging/windows/OpenRA.nsi index 2fde84806e..73eb3d89db 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.zip ra-packages.zip + NSISdl::download http://open-ra.org/packages/ra-packages.php 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.zip cnc-packages.zip + NSISdl::download http://open-ra.org/packages/cnc-packages.php cnc-packages.zip Pop $R0 StrCmp $R0 "success" +2 Abort diff --git a/web/packages/cnc-mirrors.txt b/web/packages/cnc-mirrors.txt index 3ae2cec21d..939cfe2c00 100644 --- a/web/packages/cnc-mirrors.txt +++ b/web/packages/cnc-mirrors.txt @@ -1,2 +1,3 @@ http://metahash.com/packages/cnc-packages.zip -http://openra.res0l.net/packages/cnc-packages.zip \ No newline at end of file +http://openra.res0l.net/packages/cnc-packages.zip +http://open-ra.org/packages/cnc-packages.zip diff --git a/web/packages/ra-mirrors.txt b/web/packages/ra-mirrors.txt index fabeae9893..ec08011fb1 100644 --- a/web/packages/ra-mirrors.txt +++ b/web/packages/ra-mirrors.txt @@ -1,2 +1,3 @@ http://metahash.com/packages/ra-packages.zip -http://openra.res0l.net/packages/ra-packages.zip \ No newline at end of file +http://openra.res0l.net/packages/ra-packages.zip +http://open-ra.org/packages/ra-packages.zip