Merge pull request #172859 from EricFromCanada/fix-conflicts-with

various casks: fix more conflicts
Homebrew · May 3, 2024 · d0d37a8 · d0d37a8
2 parents ef23326 + 319de45
commit d0d37a8
Show file tree

Hide file tree

Showing 25 changed files with 80 additions and 72 deletions.
diff --git a/Casks/c/chromedriver.rb b/Casks/c/chromedriver.rb
@@ -19,7 +19,7 @@
     end
   end
 
-  conflicts_with cask: "chromedriver-beta"
+  conflicts_with cask: "chromedriver@beta"
 
   binary "chromedriver-mac-#{arch}/chromedriver"
 

diff --git a/Casks/f/firefox@cn.rb b/Casks/f/firefox@cn.rb
@@ -13,11 +13,10 @@
   end
 
   auto_updates true
-  conflicts_with cask: %w[
-    firefox
-    firefox@beta
-    firefox@developer-edition
-    firefox@esr
+  conflicts_with cask: [
+    "firefox",
+    "firefox@beta",
+    "firefox@esr",
   ]
   depends_on macos: ">= :catalina"
 

diff --git a/Casks/m/macfuse.rb b/Casks/m/macfuse.rb
@@ -14,7 +14,7 @@
   end
 
   auto_updates true
-  conflicts_with cask: "macfuse-dev"
+  conflicts_with cask: "macfuse@dev"
   depends_on macos: ">= :sierra"
 
   pkg "Extras/macFUSE #{version}.pkg"

diff --git a/Casks/m/mi.rb b/Casks/m/mi.rb
@@ -12,7 +12,7 @@
     strategy :sparkle, &:short_version
   end
 
-  conflicts_with cask: "mi-beta"
+  conflicts_with cask: "mi@beta"
   depends_on macos: ">= :high_sierra"
 
   app "mi.app"

diff --git a/Casks/m/mixxx.rb b/Casks/m/mixxx.rb
@@ -12,7 +12,7 @@
     regex(%r{href=.*?/mixxx[._-]v?(\d+(?:\.\d+)+)[._-]macos(?:intel|arm)\.dmg}i)
   end
 
-  conflicts_with cask: "mixxx-snapshot"
+  conflicts_with cask: "mixxx@snapshot"
 
   app "Mixxx.app"
 

diff --git a/Casks/m/mullvadvpn.rb b/Casks/m/mullvadvpn.rb
@@ -13,7 +13,7 @@
     strategy :header_match
   end
 
-  conflicts_with cask: "mullvadvpn-beta"
+  conflicts_with cask: "mullvadvpn@beta"
   depends_on macos: ">= :big_sur"
 
   pkg "MullvadVPN-#{version}.pkg"

diff --git a/Casks/o/openemu.rb b/Casks/o/openemu.rb
@@ -19,7 +19,7 @@
   homepage "https://openemu.org/"
 
   auto_updates true
-  conflicts_with cask: "openemu-experimental"
+  conflicts_with cask: "openemu@experimental"
 
   app "OpenEmu.app"
 

diff --git a/Casks/p/parallels@12.rb b/Casks/p/parallels@12.rb
@@ -15,14 +15,14 @@
     end
   end
 
-  conflicts_with cask: %w[
-    parallels
-    parallels13
-    parallels14
-    parallels15
-    parallels16
-    parallels17
-    parallels18
+  conflicts_with cask: [
+    "parallels",
+    "parallels@13",
+    "parallels@14",
+    "parallels@15",
+    "parallels@16",
+    "parallels@17",
+    "parallels@18",
   ]
   depends_on macos: "<= :sierra"
 

diff --git a/Casks/p/parallels@13.rb b/Casks/p/parallels@13.rb
@@ -15,14 +15,14 @@
     end
   end
 
-  conflicts_with cask: %w[
-    parallels
-    parallels12
-    parallels14
-    parallels15
-    parallels16
-    parallels17
-    parallels18
+  conflicts_with cask: [
+    "parallels",
+    "parallels@12",
+    "parallels@14",
+    "parallels@15",
+    "parallels@16",
+    "parallels@17",
+    "parallels@18",
   ]
   depends_on macos: "<= :high_sierra"
 

diff --git a/Casks/p/parallels@14.rb b/Casks/p/parallels@14.rb
@@ -16,14 +16,14 @@
   end
 
   auto_updates true
-  conflicts_with cask: %w[
-    parallels
-    parallels12
-    parallels13
-    parallels15
-    parallels16
-    parallels17
-    parallels18
+  conflicts_with cask: [
+    "parallels",
+    "parallels@12",
+    "parallels@13",
+    "parallels@15",
+    "parallels@16",
+    "parallels@17",
+    "parallels@18",
   ]
   depends_on macos: [
     :el_capitan,

diff --git a/Casks/p/parallels@16.rb b/Casks/p/parallels@16.rb
@@ -16,14 +16,14 @@
   end
 
   auto_updates true
-  conflicts_with cask: %w[
-    parallels
-    parallels12
-    parallels13
-    parallels14
-    parallels15
-    parallels17
-    parallels18
+  conflicts_with cask: [
+    "parallels",
+    "parallels@12",
+    "parallels@13",
+    "parallels@14",
+    "parallels@15",
+    "parallels@17",
+    "parallels@18",
   ]
   depends_on macos: ">= :high_sierra"
 

diff --git a/Casks/p/parallels@17.rb b/Casks/p/parallels@17.rb
@@ -16,14 +16,14 @@
   end
 
   auto_updates true
-  conflicts_with cask: %w[
-    parallels
-    parallels12
-    parallels13
-    parallels14
-    parallels15
-    parallels16
-    parallels18
+  conflicts_with cask: [
+    "parallels",
+    "parallels@12",
+    "parallels@13",
+    "parallels@14",
+    "parallels@15",
+    "parallels@16",
+    "parallels@18",
   ]
   depends_on macos: ">= :high_sierra"
 

diff --git a/Casks/p/parallels@18.rb b/Casks/p/parallels@18.rb
@@ -16,14 +16,14 @@
   end
 
   auto_updates true
-  conflicts_with cask: %w[
-    parallels
-    parallels12
-    parallels13
-    parallels14
-    parallels15
-    parallels16
-    parallels17
+  conflicts_with cask: [
+    "parallels",
+    "parallels@12",
+    "parallels@13",
+    "parallels@14",
+    "parallels@15",
+    "parallels@16",
+    "parallels@17",
   ]
   depends_on macos: ">= :mojave"
 

diff --git a/Casks/p/picoscope.rb b/Casks/p/picoscope.rb
@@ -12,7 +12,7 @@
     regex(%r{href=.*?/PicoScope[._-]v?(\d+(?:.\d+)+)[._-]T(?:and|n)M[._-]Stable\.pkg}i)
   end
 
-  conflicts_with cask: "picoscope-beta"
+  conflicts_with cask: "picoscope@beta"
   depends_on macos: ">= :high_sierra"
 
   pkg "PicoScope_#{version}_TandM_Stable.pkg"

diff --git a/Casks/r/rstudio.rb b/Casks/r/rstudio.rb
@@ -18,7 +18,7 @@
     end
   end
 
-  conflicts_with cask: "rstudio-daily"
+  conflicts_with cask: "rstudio@daily"
   depends_on macos: ">= :monterey"
 
   app "RStudio.app"

diff --git a/Casks/s/sublime-merge.rb b/Casks/s/sublime-merge.rb
@@ -14,7 +14,7 @@
   end
 
   auto_updates true
-  conflicts_with cask: "sublime-merge-dev"
+  conflicts_with cask: "sublime-merge@dev"
 
   app "Sublime Merge.app"
   binary "#{appdir}/Sublime Merge.app/Contents/SharedSupport/bin/smerge"

diff --git a/Casks/s/surge.rb b/Casks/s/surge.rb
@@ -18,7 +18,7 @@
   end
 
   auto_updates true
-  conflicts_with cask: "surge4"
+  conflicts_with cask: "surge@4"
   depends_on macos: ">= :high_sierra"
 
   app "Surge.app"

diff --git a/Casks/t/telegram-desktop.rb b/Casks/t/telegram-desktop.rb
@@ -14,7 +14,7 @@
   end
 
   auto_updates true
-  conflicts_with cask: "telegram-desktop-beta"
+  conflicts_with cask: "telegram-desktop@beta"
   depends_on macos: ">= :sierra"
 
   # Renamed to avoid conflict with telegram

diff --git a/Casks/v/virtualbox.rb b/Casks/v/virtualbox.rb
@@ -17,7 +17,10 @@
     end
   end
 
-  conflicts_with cask: "virtualbox-beta"
+  conflicts_with cask: [
+    "virtualbox@6",
+    "virtualbox@beta",
+  ]
   depends_on macos: ">= :catalina"
   depends_on arch: :x86_64
 

diff --git a/Casks/v/virtualbox@6.rb b/Casks/v/virtualbox@6.rb
@@ -15,7 +15,10 @@
     end
   end
 
-  conflicts_with cask: "virtualbox-beta"
+  conflicts_with cask: [
+    "virtualbox",
+    "virtualbox@beta",
+  ]
   depends_on macos: ">= :high_sierra"
   depends_on arch: :x86_64
 

diff --git a/Casks/v/virtualbox@beta.rb b/Casks/v/virtualbox@beta.rb
@@ -20,7 +20,10 @@
     regex(/href=.*?VirtualBox[._-]v?(\d+(?:[.-]\d+)+.*?)[._-]#{arch}\.dmg(?!.+?development)/i)
   end
 
-  conflicts_with cask: "virtualbox"
+  conflicts_with cask: [
+    "virtualbox",
+    "virtualbox@6",
+  ]
   depends_on macos: ">= :catalina"
 
   pkg "VirtualBox.pkg",

diff --git a/Casks/w/whoozle-android-file-transfer.rb b/Casks/w/whoozle-android-file-transfer.rb
@@ -8,7 +8,7 @@
   desc "Android File Transfer for Linux"
   homepage "https://whoozle.github.io/android-file-transfer-linux/"
 
-  conflicts_with cask: "whoozle-android-file-transfer-nightly"
+  conflicts_with cask: "whoozle-android-file-transfer@nightly"
 
   app "Android File Transfer for Linux.app"
   binary "#{appdir}/Android File Transfer for Linux.app/Contents/SharedSupport/bin/aft-mtp-cli"

diff --git a/Casks/w/wine-stable.rb b/Casks/w/wine-stable.rb
@@ -32,8 +32,8 @@
   end
 
   conflicts_with cask: [
-    "wine-devel",
-    "wine-staging",
+    "wine@devel",
+    "wine@staging",
   ]
   depends_on cask: "gstreamer-runtime"
   depends_on macos: ">= :catalina"

diff --git a/Casks/w/wine@devel.rb b/Casks/w/wine@devel.rb
@@ -19,7 +19,7 @@
 
   conflicts_with cask: [
     "wine-stable",
-    "wine-staging",
+    "wine@staging",
   ]
   depends_on cask: "gstreamer-runtime"
   depends_on macos: ">= :catalina"

diff --git a/Casks/w/wine@staging.rb b/Casks/w/wine@staging.rb
@@ -19,7 +19,7 @@
 
   conflicts_with cask: [
     "wine-stable",
-    "wine-devel",
+    "wine@devel",
   ]
   depends_on cask: "gstreamer-runtime"
   depends_on macos: ">= :catalina"