diff --git a/Aliases/htop-osx b/Aliases/htop-osx new file mode 120000 index 00000000000..b1b8be05612 --- /dev/null +++ b/Aliases/htop-osx @@ -0,0 +1 @@ +../Formula/htop.rb \ No newline at end of file diff --git a/Formula/htop-osx.rb b/Formula/htop-osx.rb deleted file mode 100644 index bd68cfee904..00000000000 --- a/Formula/htop-osx.rb +++ /dev/null @@ -1,38 +0,0 @@ -class HtopOsx < Formula - desc "Improved top (interactive process viewer) for macOS" - homepage "https://github.com/max-horvath/htop-osx" - url "https://github.com/max-horvath/htop-osx/archive/0.8.2.8.tar.gz" - sha256 "3d8614a3be5f5ba76a96b22c14a456dc66242c5ef1ef8660a60bb6b766543458" - - bottle do - rebuild 1 - sha256 "d773bb9ba1fb90b8d0e908a7e962df5936e2a74fe116e2d65bda7070c3ac7e9c" => :high_sierra - sha256 "53811a029ba083125086a88e75e1b50d1df13fccd7f96a53b639b7eed826c229" => :sierra - sha256 "9eea952eb4849a3c7e60772df5701b826e9b7cb2751dfe5d434baf83bad56b0d" => :el_capitan - sha256 "d0e2cc8d452bde53d949a6d498346678b7b00c6d9c61471cd0a33e6dcbbe5399" => :yosemite - sha256 "355a26860f7eb39a10915a15ccc9e84593d29f63137562910302c497df447963" => :mavericks - end - - depends_on "autoconf" => :build - depends_on "automake" => :build - depends_on "libtool" => :build - - conflicts_with "htop", :because => "both install an `htop` binary" - - def install - system "./autogen.sh" - system "./configure", "--disable-dependency-tracking", "--prefix=#{prefix}" - system "make", "install", "DEFAULT_INCLUDES='-iquote .'" - end - - def caveats; <<-EOS.undent - htop-osx requires root privileges to correctly display all running processes, - so you will need to run `sudo htop`. - You should be certain that you trust any software you grant root privileges. - EOS - end - - test do - pipe_output("#{bin}/htop", "q", 0) - end -end diff --git a/Formula/htop.rb b/Formula/htop.rb index ec8ec496230..4900b231101 100644 --- a/Formula/htop.rb +++ b/Formula/htop.rb @@ -24,8 +24,6 @@ class Htop < Formula depends_on "ncurses" => :optional - conflicts_with "htop-osx", :because => "both install an `htop` binary" - def install system "./autogen.sh" if build.head? system "./configure", "--prefix=#{prefix}" diff --git a/formula_renames.json b/formula_renames.json index 7c3fe568f15..aceadcd8a28 100644 --- a/formula_renames.json +++ b/formula_renames.json @@ -77,6 +77,7 @@ "gtef": "tepl", "hamsterdb": "upscaledb", "heroku-toolbelt": "heroku", + "htop-osx": "htop", "httpd24": "httpd", "influxdb08": "influxdb@0.8", "isl011": "isl@0.11",