aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Library/Homebrew/cmd/test-bot.rb20
-rw-r--r--Library/Homebrew/download_strategy.rb6
-rw-r--r--Library/Homebrew/manpages/brew.1.md6
-rw-r--r--Library/Homebrew/software_spec.rb8
-rw-r--r--Library/Homebrew/test/test_versions.rb14
-rw-r--r--share/man/man1/brew.17
6 files changed, 10 insertions, 51 deletions
diff --git a/Library/Homebrew/cmd/test-bot.rb b/Library/Homebrew/cmd/test-bot.rb
index 6ba85396f..8ea39bf5c 100644
--- a/Library/Homebrew/cmd/test-bot.rb
+++ b/Library/Homebrew/cmd/test-bot.rb
@@ -452,11 +452,7 @@ module Homebrew
bottle_args = ["--rb", formula_name]
if @tap
tap_user, tap_repo = @tap.split "/"
- if ENV["HOMEBREW_SOURCEFORGE_TESTING"]
- bottle_args << "--root-url=#{BottleSpecification::DEFAULT_ROOT_URL}/#{tap_repo}"
- else
- bottle_args << "--root-url=#{BottleSpecification::DEFAULT_DOMAIN}/#{Bintray.repository(@tap)}"
- end
+ bottle_args << "--root-url=#{BottleSpecification::DEFAULT_DOMAIN}/#{Bintray.repository(@tap)}"
end
bottle_args << { :puts_output_on_success => true }
test "brew", "bottle", *bottle_args
@@ -746,7 +742,6 @@ module Homebrew
tag = pr ? "pr-#{pr}" : "testing-#{number}"
safe_system "git", "push", "--force", remote, "master:master", ":refs/tags/#{tag}"
- # Bintray upload (will take over soon)
bintray_repo = Bintray.repository(tap)
bintray_repo_url = "https://api.bintray.com/packages/homebrew/#{bintray_repo}"
formula_packaged = {}
@@ -775,19 +770,6 @@ module Homebrew
puts
end
- # SourceForge upload (will be removed soon)
- path = "/home/frs/project/m/ma/machomebrew/Bottles/"
- if tap
- tap_user, tap_repo = tap.split "/"
- path += "#{tap_repo}/"
- end
- url = "BrewTestBot,machomebrew@frs.sourceforge.net:#{path}"
-
- rsync_args = %w[--partial --progress --human-readable --compress]
- rsync_args += Dir["*.bottle*.tar.gz"] + [url]
-
- safe_system "rsync", *rsync_args
-
safe_system "git", "tag", "--force", tag
safe_system "git", "push", "--force", remote, "refs/tags/#{tag}"
return
diff --git a/Library/Homebrew/download_strategy.rb b/Library/Homebrew/download_strategy.rb
index 9406cc932..42dde8315 100644
--- a/Library/Homebrew/download_strategy.rb
+++ b/Library/Homebrew/download_strategy.rb
@@ -372,12 +372,6 @@ end
# This strategy extracts our binary packages.
class CurlBottleDownloadStrategy < CurlDownloadStrategy
- def curl(*args)
- mirror = ENV["HOMEBREW_SOURCEFORGE_MIRROR"]
- args << "-G" << "-d" << "use_mirror=#{mirror}" if mirror
- super
- end
-
def stage
ohai "Pouring #{cached_location.basename}"
super
diff --git a/Library/Homebrew/manpages/brew.1.md b/Library/Homebrew/manpages/brew.1.md
index ef8834266..d9f834821 100644
--- a/Library/Homebrew/manpages/brew.1.md
+++ b/Library/Homebrew/manpages/brew.1.md
@@ -562,12 +562,6 @@ can take several different forms:
Text printed before the installation summary of each successful build.
Defaults to the beer emoji.
- * HOMEBREW\_SOURCEFORGE\_MIRROR:
- If set, Homebrew will use the value of `HOMEBREW_SOURCEFORGE_MIRROR` to
- select a SourceForge mirror for downloading bottles.
-
- *Example:* `export HOMEBREW_SOURCEFORGE_MIRROR='heanet'`
-
* HOMEBREW\_SVN:
When exporting from Subversion, Homebrew will use `HOMEBREW_SVN` if set,
a Homebrew-built Subversion if installed, or the system-provided binary.
diff --git a/Library/Homebrew/software_spec.rb b/Library/Homebrew/software_spec.rb
index 557f1cccb..b6ec3b485 100644
--- a/Library/Homebrew/software_spec.rb
+++ b/Library/Homebrew/software_spec.rb
@@ -251,12 +251,8 @@ end
class BottleSpecification
DEFAULT_PREFIX = "/usr/local".freeze
DEFAULT_CELLAR = "/usr/local/Cellar".freeze
- if ENV["HOMEBREW_SOURCEFORGE_TESTING"]
- DEFAULT_ROOT_URL = "https://downloads.sf.net/project/machomebrew/Bottles".freeze
- else
- DEFAULT_DOMAIN = "https://homebrew.bintray.com".freeze
- DEFAULT_ROOT_URL = "#{DEFAULT_DOMAIN}/bottles".freeze
- end
+ DEFAULT_DOMAIN = "https://homebrew.bintray.com".freeze
+ DEFAULT_ROOT_URL = "#{DEFAULT_DOMAIN}/bottles".freeze
attr_rw :root_url, :prefix, :cellar, :revision
attr_reader :checksum, :collector
diff --git a/Library/Homebrew/test/test_versions.rb b/Library/Homebrew/test/test_versions.rb
index e520ad55e..6625177f8 100644
--- a/Library/Homebrew/test/test_versions.rb
+++ b/Library/Homebrew/test/test_versions.rb
@@ -230,23 +230,23 @@ class VersionParsingTests < Homebrew::TestCase
end
def test_bottle_style
- assert_version_detected '4.8.0', 'https://downloads.sf.net/project/machomebrew/Bottles/qt-4.8.0.lion.bottle.tar.gz'
+ assert_version_detected '4.8.0', 'https://homebrew.bintray.com/bottles/qt-4.8.0.lion.bottle.tar.gz'
end
def test_versioned_bottle_style
- assert_version_detected '4.8.1', 'https://downloads.sf.net/project/machomebrew/Bottles/qt-4.8.1.lion.bottle.1.tar.gz'
+ assert_version_detected '4.8.1', 'https://homebrew.bintray.com/bottles/qt-4.8.1.lion.bottle.1.tar.gz'
end
def test_erlang_bottle_style
- assert_version_detected 'R15B', 'https://downloads.sf.net/project/machomebrew/Bottles/erlang-R15B.lion.bottle.tar.gz'
+ assert_version_detected 'R15B', 'https://homebrew.bintray.com/bottles/erlang-R15B.lion.bottle.tar.gz'
end
def test_another_erlang_bottle_style
- assert_version_detected 'R15B01', 'https://downloads.sf.net/project/machomebrew/Bottles/erlang-R15B01.mountain_lion.bottle.tar.gz'
+ assert_version_detected 'R15B01', 'https://homebrew.bintray.com/bottles/erlang-R15B01.mountain_lion.bottle.tar.gz'
end
def test_yet_another_erlang_bottle_style
- assert_version_detected 'R15B03-1', 'https://downloads.sf.net/project/machomebrew/Bottles/erlang-R15B03-1.mountainlion.bottle.tar.gz'
+ assert_version_detected 'R15B03-1', 'https://homebrew.bintray.com/bottles/erlang-R15B03-1.mountainlion.bottle.tar.gz'
end
def test_imagemagick_style
@@ -254,11 +254,11 @@ class VersionParsingTests < Homebrew::TestCase
end
def test_imagemagick_bottle_style
- assert_version_detected '6.7.5-7', 'https://downloads.sf.net/project/machomebrew/Bottles/imagemagick-6.7.5-7.lion.bottle.tar.gz'
+ assert_version_detected '6.7.5-7', 'https://homebrew.bintray.com/bottles/imagemagick-6.7.5-7.lion.bottle.tar.gz'
end
def test_imagemagick_versioned_bottle_style
- assert_version_detected '6.7.5-7', 'https://downloads.sf.net/project/machomebrew/Bottles/imagemagick-6.7.5-7.lion.bottle.1.tar.gz'
+ assert_version_detected '6.7.5-7', 'https://homebrew.bintray.com/bottles/imagemagick-6.7.5-7.lion.bottle.1.tar.gz'
end
def test_dash_version_dash_style
diff --git a/share/man/man1/brew.1 b/share/man/man1/brew.1
index 6379edbe2..807463ad6 100644
--- a/share/man/man1/brew.1
+++ b/share/man/man1/brew.1
@@ -584,13 +584,6 @@ HOMEBREW_INSTALL_BADGE
Text printed before the installation summary of each successful build\. Defaults to the beer emoji\.
.
.TP
-HOMEBREW_SOURCEFORGE_MIRROR
-If set, Homebrew will use the value of \fBHOMEBREW_SOURCEFORGE_MIRROR\fR to select a SourceForge mirror for downloading bottles\.
-.
-.IP
-\fIExample:\fR \fBexport HOMEBREW_SOURCEFORGE_MIRROR=\'heanet\'\fR
-.
-.TP
HOMEBREW_SVN
When exporting from Subversion, Homebrew will use \fBHOMEBREW_SVN\fR if set, a Homebrew\-built Subversion if installed, or the system\-provided binary\.
.
generated by cgit v1.2.3 (git 2.25.1) at 2025-10-31 07:55:16 +0000