diff --git a/Aliases/juju@2.0 b/Aliases/juju@2.0 new file mode 120000 index 00000000000..e8d4f6513a5 --- /dev/null +++ b/Aliases/juju@2.0 @@ -0,0 +1 @@ +../Formula/juju.rb \ No newline at end of file diff --git a/Formula/juju@2.0.rb b/Formula/juju.rb similarity index 88% rename from Formula/juju@2.0.rb rename to Formula/juju.rb index c6268356d4d..7239c62f554 100644 --- a/Formula/juju@2.0.rb +++ b/Formula/juju.rb @@ -1,8 +1,9 @@ -class JujuAT20 < Formula +class Juju < Formula desc "DevOps management tool" homepage "https://jujucharms.com/" url "https://launchpad.net/juju/2.0/2.0.1/+download/juju-core_2.0.1.tar.gz" sha256 "af5d59f4b4508c3f81b15fe052fe377876f5de845885d6d41d054f4ac605b9e9" + revision 1 bottle do cellar :any_skip_relocation @@ -12,7 +13,6 @@ class JujuAT20 < Formula end depends_on "go" => :build - conflicts_with "juju@1.25", :because => "juju 1 and 2 cannot be installed simultaneously." def install ENV["GOPATH"] = buildpath diff --git a/formula_renames.json b/formula_renames.json index d7d380d753d..53e99f426cf 100644 --- a/formula_renames.json +++ b/formula_renames.json @@ -42,8 +42,8 @@ "isl012": "isl@0.12", "isl014": "isl@0.14", "kotlin-compiler": "kotlin", - "juju": "juju@1.25", - "juju2": "juju@2.0", + "juju2": "juju", + "juju@2.0": "juju", "letsencrypt": "certbot", "libcppa": "caf", "libmongoclient": "mongo-cxx-driver",