Merge pull request #172356 from Homebrew/migrate-1-password

Homebrew · Apr 29, 2024 · 644d633 · 644d633
2 parents 64cc255 + 2da0a69
commit 644d633
Show file tree

Hide file tree

Showing 7 changed files with 35 additions and 0 deletions.
diff --git a/Casks/1/1password-cli.rb b/Casks/1/1password-cli.rb
@@ -16,6 +16,11 @@
     regex(%r{href=.*?/op_apple_universal[._-]v?(\d+(?:\.\d+)+)\.pkg}i)
   end
 
+  conflicts_with cask: [
+    "1password-cli@1",
+    "1password-cli@beta",
+  ]
+
   binary "op"
 
   zap trash: "~/.op"

diff --git a/Casks/1/1password-cli@1.rb b/Casks/1/1password-cli@1.rb
@@ -13,6 +13,11 @@
     regex(%r{href=.*?/op_apple_universal[._-]v?(\d+(?:\.\d+)+)\.pkg}i)
   end
 
+  conflicts_with cask: [
+    "1password-cli",
+    "1password-cli@beta",
+  ]
+
   pkg "op_apple_universal_v#{version}.pkg"
 
   uninstall pkgutil: "com.1password.op"

diff --git a/Casks/1/1password-cli@beta.rb b/Casks/1/1password-cli@beta.rb
@@ -13,6 +13,11 @@
     regex(%r{href=.*?/op_apple_universal[._-]v?(\d+(?:\.\d+)+-beta\.\d+)\.pkg}i)
   end
 
+  conflicts_with cask: [
+    "1password-cli",
+    "1password-cli@1",
+  ]
+
   pkg "op_apple_universal_v#{version}.pkg"
 
   uninstall pkgutil: "com.1password.op"

diff --git a/Casks/1/1password.rb b/Casks/1/1password.rb
@@ -16,6 +16,11 @@
   end
 
   auto_updates true
+  conflicts_with cask: [
+    "1password@7",
+    "1password@beta",
+    "1password@nightly",
+  ]
   depends_on macos: ">= :catalina"
 
   app "1Password.app"

diff --git a/Casks/1/1password@7.rb b/Casks/1/1password@7.rb
@@ -13,6 +13,11 @@
   end
 
   auto_updates true
+  conflicts_with cask: [
+    "1password",
+    "1password@beta",
+    "1password@nightly",
+  ]
   depends_on macos: ">= :high_sierra"
 
   app "1Password #{version.major}.app"

diff --git a/Casks/1/1password@beta.rb b/Casks/1/1password@beta.rb
@@ -16,6 +16,11 @@
   end
 
   auto_updates true
+  conflicts_with cask: [
+    "1password",
+    "1password@7",
+    "1password@nightly",
+  ]
   depends_on macos: ">= :catalina"
 
   app "1Password.app"

diff --git a/Casks/1/1password@nightly.rb b/Casks/1/1password@nightly.rb
@@ -9,6 +9,11 @@
   desc "Password manager"
   homepage "https://1password.com/"
 
+  conflicts_with cask: [
+    "1password",
+    "1password@7",
+    "1password@beta",
+  ]
   depends_on macos: ">= :catalina"
 
   app "1Password.app"