From 4dde0b7752f177bd84070f33ad7b409641f4336b Mon Sep 17 00:00:00 2001 From: Razvan Azamfirei Date: Sat, 27 Apr 2024 19:49:29 -0400 Subject: [PATCH 1/7] 1password: update conflicts --- Casks/1/1password.rb | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Casks/1/1password.rb b/Casks/1/1password.rb index 72705a031e47..22d446a08839 100644 --- 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" From 8b4912b12fa62a667939c4c006f4f9020dd9c15e Mon Sep 17 00:00:00 2001 From: Razvan Azamfirei Date: Sat, 27 Apr 2024 19:49:47 -0400 Subject: [PATCH 2/7] 1password-cli: update conflicts --- Casks/1/1password-cli.rb | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Casks/1/1password-cli.rb b/Casks/1/1password-cli.rb index c873e290cc9e..acf40886ad22 100644 --- 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" From d74e2fd646ba8a80cba5b2e0dba19c0945768a74 Mon Sep 17 00:00:00 2001 From: Razvan Azamfirei Date: Sat, 27 Apr 2024 19:50:04 -0400 Subject: [PATCH 3/7] 1password@7: update conflicts --- Casks/1/1password@7.rb | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Casks/1/1password@7.rb b/Casks/1/1password@7.rb index cc84398b7d8c..63f9c0d64106 100644 --- 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" From 012c18f02187719c2f5b9558cc20680e8de72bed Mon Sep 17 00:00:00 2001 From: Razvan Azamfirei Date: Sat, 27 Apr 2024 19:50:15 -0400 Subject: [PATCH 4/7] 1password@beta: update conflicts --- Casks/1/1password@beta.rb | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Casks/1/1password@beta.rb b/Casks/1/1password@beta.rb index 70538de7f586..3a71751bafda 100644 --- 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" From 7bc654e951603a0747f59d788b9b532d979948a3 Mon Sep 17 00:00:00 2001 From: Razvan Azamfirei Date: Sat, 27 Apr 2024 19:50:32 -0400 Subject: [PATCH 5/7] 1password@nightly: update conflicts --- Casks/1/1password@nightly.rb | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Casks/1/1password@nightly.rb b/Casks/1/1password@nightly.rb index 612218a17cce..597bf37d0159 100644 --- 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" From 742d6328e105dbeed6c7d8cca67b29ac570c2f1c Mon Sep 17 00:00:00 2001 From: Razvan Azamfirei Date: Sat, 27 Apr 2024 19:50:40 -0400 Subject: [PATCH 6/7] 1password-cli@1: update conflicts --- Casks/1/1password-cli@1.rb | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Casks/1/1password-cli@1.rb b/Casks/1/1password-cli@1.rb index ccdde30aa7f7..d500ad304616 100644 --- 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" From 2da0a694dbe09f9865a425589169730fd2ce41e8 Mon Sep 17 00:00:00 2001 From: Razvan Azamfirei Date: Sat, 27 Apr 2024 19:50:48 -0400 Subject: [PATCH 7/7] 1password-cli@beta: update conflicts --- Casks/1/1password-cli@beta.rb | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Casks/1/1password-cli@beta.rb b/Casks/1/1password-cli@beta.rb index 40c56992116b..bcd253db4fa6 100644 --- 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"