Merge pull request #159370 from samford/reduce-redirections-2

Update URLs to resolve unnecessary redirections, part 2

Casks/a/airdisplay.rb

@@ -2,13 +2,13 @@ cask "airdisplay" do
   version "3.4.2"
   sha256 "272d14f33b3a4a16e5e0e1ebb2d519db4e0e3da17f95f77c91455b354bee7ee7"
 
-  url "https://www.avatron.com/updates/software/airdisplay/ad#{version.no_dots}.zip"
+  url "https://avatron.com/updates/software/airdisplay/ad#{version.no_dots}.zip"
   name "Air Display"
   desc "Utility for using a tablet as a second monitor"
   homepage "https://avatron.com/applications/air-display/"
 
   livecheck do
-    url "https://www.avatron.com/updates/software/airdisplay/appcast.xml"
+    url "https://avatron.com/updates/software/airdisplay/appcast.xml"
     strategy :sparkle, &:short_version
   end
 

Casks/c/choosy.rb

@@ -54,7 +54,7 @@ cask "choosy" do
     sha256 "8d6a44b78ed256d6f502872fd1f62cf1f7fea877906bedddc5bbf26f93b6ea57"
 
     livecheck do
-      url "https://www.choosyosx.com/sparkle/feed"
+      url "https://choosy.app/sparkle/feed"
       strategy :sparkle
     end
 
@@ -63,10 +63,10 @@ cask "choosy" do
     pkg "Choosy.pkg"
   end
 
-  url "https://downloads.choosyosx.com/choosy_#{version}.zip"
+  url "https://downloads.choosy.app/choosy_#{version}.zip"
   name "Choosy"
   desc "Open links in any browser"
-  homepage "https://www.choosyosx.com/"
+  homepage "https://choosy.app/"
 
   uninstall pkgutil: "com.choosyosx.Choosy",
             quit:    "com.choosyosx.Choosy"

Casks/c/cursorcerer.rb

@@ -2,9 +2,10 @@ cask "cursorcerer" do
   version "3.5"
   sha256 :no_check
 
-  url "http://www.doomlaser.com/downloads/Cursorcerer.zip"
+  url "https://www.doomlaser.com/downloads/Cursorcerer.zip"
   name "Cursorcerer"
-  homepage "http://doomlaser.com/cursorcerer-hide-your-cursor-at-will/"
+  desc "Preference Pane for controlling cursor hiding"
+  homepage "https://doomlaser.com/cursorcerer-hide-your-cursor-at-will/"
 
   livecheck do
     url :homepage

Casks/d/dbschema.rb

@@ -2,13 +2,13 @@ cask "dbschema" do
   version "9.4.3"
   sha256 :no_check # required as upstream package is updated in-place
 
-  url "https://www.dbschema.com/download/DbSchema_macos_#{version.dots_to_underscores}.tgz"
+  url "https://dbschema.com/download/DbSchema_macos_#{version.dots_to_underscores}.tgz"
   name "DbSchema"
   desc "Design, document and deploy databases"
-  homepage "https://www.dbschema.com/"
+  homepage "https://dbschema.com/"
 
   livecheck do
-    url "https://www.dbschema.com/download.html"
+    url "https://dbschema.com/download.html"
     regex(/href=.*?DbSchema[._-]macos[._-]v?(\d+(?:_\d+)+)\.t/i)
     strategy :page_match do |page, regex|
       page.scan(regex)&.map { |match| match[0].tr("_", ".") }

Casks/d/ddnet.rb

@@ -2,13 +2,13 @@ cask "ddnet" do
   version "17.3"
   sha256 "933a16f9defdd3260510a5ebb17f5bf7bc44bda8816fbd145e541e0de98a7173"
 
-  url "https://ddnet.tw/downloads/DDNet-#{version}-macos.dmg"
+  url "https://ddnet.org/downloads/DDNet-#{version}-macos.dmg"
   name "DDNet"
   desc "Cooperative online platform game based on Teeworlds"
-  homepage "https://ddnet.tw/"
+  homepage "https://ddnet.org/"
 
   livecheck do
-    url "https://ddnet.tw/downloads/"
+    url "https://ddnet.org/downloads/"
     regex(/href=.*?DDNet[._-]v?(\d+(?:\.\d+)+)[^"' >]*?\.dmg/i)
   end
 

Casks/d/denemo.rb

@@ -2,13 +2,13 @@ cask "denemo" do
   version "2.2"
   sha256 "6ec66279be560e6e997b1108ae9ed61e6c37c36a350fbd99cd3dded8e2cfbe5f"
 
-  url "http://denemo.org/downloads/denemo-#{version}-darwin-x64.tar.bz2"
+  url "https://denemo.org/downloads/denemo-#{version}-darwin-x64.tar.bz2"
   name "Denemo"
   desc "Music notation program"
-  homepage "http://denemo.org/"
+  homepage "https://denemo.org/"
 
   livecheck do
-    url "http://denemo.org/downloads/"
+    url "https://denemo.org/downloads/"
     regex(/href=.*?denemo[._-]v?(\d+(?:\.\d+)+)[._-]darwin[._-]x64.tar\.bz2/i)
   end
 

Casks/f/filemon.rb

@@ -2,9 +2,10 @@ cask "filemon" do
   version "2.0"
   sha256 :no_check
 
-  url "http://newosxbook.com/tools/filemon.tgz"
+  url "https://newosxbook.com/tools/filemon.tgz"
   name "File Monitor"
-  homepage "http://NewOSXBook.com/tools/filemon.html"
+  desc "FSEvents client"
+  homepage "https://newosxbook.com/tools/filemon.html"
 
   livecheck do
     url :homepage

Casks/i/isolator.rb

@@ -2,12 +2,13 @@ cask "isolator" do
   version "4.99beta"
   sha256 "8ab9344efd503606c88dbd5a139e932f37d25ec9b8d7c574a6af9f6cf1d9bcaf"
 
-  url "https://willmore.eu/software/download/Isolator-#{version}.dmg"
+  url "https://www.willmore.eu/software/download/Isolator-#{version}.dmg"
   name "Isolator"
+  desc "Menu bar app that hides desktop, inactive windows, etc."
   homepage "https://www.willmore.eu/software/isolator/"
 
   livecheck do
-    url "https://willmore.eu/software/isolator/allversions.xml"
+    url "https://www.willmore.eu/software/isolator/allversions.xml"
     strategy :sparkle
   end
 

Casks/m/monity-helper.rb

@@ -2,13 +2,14 @@ cask "monity-helper" do
   version "1.2.5"
   sha256 :no_check
 
-  url "https://www.monityapp.com/download/MonityHelper.pkg"
+  url "https://monityapp.com/download/MonityHelper.pkg"
   name "Monity Helper"
-  homepage "https://www.monityapp.com/"
+  desc "Helper app for Monity to provide system stats"
+  homepage "https://monityapp.com/helper/"
 
   livecheck do
     url :homepage
-    regex(/Version:\s+(\d+(?:\.\d+)+)/i)
+    regex(/MonityHelper\.pkg.+?Version:\s+(\d+(?:\.\d+)+)/im)
   end
 
   pkg "MonityHelper.pkg"

Casks/p/programmer-dvorak.rb

@@ -2,13 +2,13 @@ cask "programmer-dvorak" do
   version "1.2.13"
   sha256 "842ffaf714aaac91b0287c4e4576f18be1bfc32693709593a118572a7cc78006"
 
-  url "https://kaufmann.no/downloads/macos/ProgrammerDvorak-#{version.dots_to_underscores}.pkg.zip"
+  url "https://www.kaufmann.no/downloads/macos/ProgrammerDvorak-#{version.dots_to_underscores}.pkg.zip"
   name "Programmer Dvorak"
   desc "Keyboard layout for programmers"
-  homepage "https://kaufmann.no/roland/dvorak/"
+  homepage "https://www.kaufmann.no/roland/dvorak/"
 
   livecheck do
-    url "https://kaufmann.no/roland/dvorak/#downloads"
+    url :homepage
     strategy :page_match do |page|
       v = page[/href=.*?ProgrammerDvorak-(\d+(?:_\d+)*)\.pkg\.zip/i, 1]
       v.tr("_", ".")

Casks/r/rocks-n-diamonds.rb

@@ -2,13 +2,13 @@ cask "rocks-n-diamonds" do
   version "4.3.2.1"
   sha256 "6499fe6382eec6506cc625b0f372a29918640cfb6ebdca3ee3e6b97d83ff458c"
 
-  url "https://www.artsoft.org/RELEASES/macosx/rocksndiamonds/rocksndiamonds-#{version}.dmg"
+  url "https://www.artsoft.org/RELEASES/mac/rocksndiamonds/rocksndiamonds-#{version}.dmg"
   name "Rocks'n'Diamonds"
   desc "Arcade-style game"
   homepage "https://www.artsoft.org/rocksndiamonds/"
 
   livecheck do
-    url "https://www.artsoft.org/RELEASES/macosx/rocksndiamonds/"
+    url "https://www.artsoft.org/RELEASES/mac/rocksndiamonds/"
     regex(/href=.*?rocksndiamonds[._-]?v?(\d+(?:\.\d+)+)\.dmg/i)
   end
 

Casks/t/topcat.rb

@@ -2,10 +2,10 @@ cask "topcat" do
   version "4.9"
   sha256 :no_check
 
-  url "http://www.starlink.ac.uk/topcat/topcat-full.dmg"
+  url "https://www.star.bristol.ac.uk/mbt/topcat/topcat-full.dmg"
   name "TOPCAT"
   desc "Interactive graphical viewer and editor for tabular data"
-  homepage "http://www.starlink.ac.uk/topcat/"
+  homepage "https://www.star.bristol.ac.uk/mbt/topcat/"
 
   livecheck do
     url :homepage

Casks/v/vsd-viewer.rb

@@ -2,13 +2,13 @@ cask "vsd-viewer" do
   version "6.16.1"
   sha256 :no_check
 
-  url "https://nektony.com/download/vsdviewer.dmg"
+  url "https://download.nektony.com/download/vsdviewer.dmg"
   name "Nektony VSD Viewer"
   desc "Preview .VSD, .VDX, .VSDX file formats of Visio drawings"
   homepage "https://nektony.com/free-visio-viewer-mac"
 
   livecheck do
-    url "https://nektony.com/promo/vsd-viewer/update/update.xml"
+    url "https://download.nektony.com/promo/vsd-viewer/update/update.xml"
     strategy :sparkle, &:short_version
   end