From ec6f5d192c0f475d2277867bc6c0605f79ff2a02 Mon Sep 17 00:00:00 2001
From: "D. Can Celasun" <can@dcc.im>
Date: Tue, 9 Mar 2021 13:10:58 +0000
Subject: [PATCH] [visual-studio-code-bin] Re-add conflict with code

/usr/bin/code is present in both packages
---
 .SRCINFO | 3 ++-
 PKGBUILD | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/.SRCINFO b/.SRCINFO
index e8239c2..e25530c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = visual-studio-code-bin
 	pkgdesc = Visual Studio Code (vscode): Editor for building and debugging modern web and cloud applications (official binary version)
 	pkgver = 1.54.1
-	pkgrel = 1
+	pkgrel = 2
 	url = https://code.visualstudio.com/
 	arch = x86_64
 	arch = i686
@@ -21,6 +21,7 @@ pkgbase = visual-studio-code-bin
 	optdepends = glib2: Needed for move to trash functionality
 	optdepends = libdbusmenu-glib: Needed for KDE global menu
 	provides = code
+	conflicts = code
 	source = visual-studio-code.desktop
 	source = visual-studio-code-url-handler.desktop
 	sha256sums = 0deefcb638e06c35a52e7e9fb8e19b2dc393f01e5c1c122d2938cddeb22cf8de
diff --git a/PKGBUILD b/PKGBUILD
index 47850aa..271ebac 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,12 +3,13 @@
 pkgname=visual-studio-code-bin
 _pkgname=visual-studio-code
 pkgver=1.54.1
-pkgrel=1
+pkgrel=2
 pkgdesc="Visual Studio Code (vscode): Editor for building and debugging modern web and cloud applications (official binary version)"
 arch=('x86_64' 'i686' 'aarch64' 'armv7h')
 url="https://code.visualstudio.com/"
 license=('custom: commercial')
 provides=('code')
+conflicts=('code')
 # lsof: need for terminal splitting, see https://github.com/Microsoft/vscode/issues/62991
 depends=(libxkbfile gnupg gtk3 libsecret nss gcc-libs libnotify libxss glibc lsof)
 optdepends=('glib2: Needed for move to trash functionality'