fix: internal conflict declaration

We don't need to specify that '*-git' package conflicts with themselves, just its non git version.

For the '*-all' package, we don't need to specify a conflict with each theme package. Instead, we
specify a conflict with any 'tela-circle-icon-theme' provider, which includes every theme package.

Additionally, we don't specify a conflict with '*-all' for each theme package, because the
conflict is already specified in the '*-all' package.

2 files changed, 42 insertions, 15 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 3c18f5d4973e..ec508b4871e1 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -10,7 +10,6 @@ pkgbase = tela-circle-icon-theme-spl-git
 	depends = gtk-update-icon-cache
 	depends = hicolor-icon-theme
 	provides = tela-circle-icon-theme
-	provides = tela-circle-icon-theme-git
 	options = !strip
 	options = !debug
 	source = tela-circle-icon-theme::git+https://github.com/vinceliuice/Tela-circle-icon-theme.git
@@ -18,35 +17,65 @@ pkgbase = tela-circle-icon-theme-spl-git
 
 pkgname = tela-circle-icon-theme-all-git
 	pkgdesc = A flat colorful design icon theme (all variants)
-	conflicts = tela-circle-icon-theme-all-git
+	conflicts = tela-circle-icon-theme
 	conflicts = tela-circle-icon-theme-all
 
 pkgname = tela-circle-icon-theme-standard-git
+	pkgdesc = A flat colorful design icon theme (standard variant)
+	conflicts = tela-circle-icon-theme-standard
 
 pkgname = tela-circle-icon-theme-black-git
+	pkgdesc = A flat colorful design icon theme (black variant)
+	conflicts = tela-circle-icon-theme-black
 
 pkgname = tela-circle-icon-theme-blue-git
+	pkgdesc = A flat colorful design icon theme (blue variant)
+	conflicts = tela-circle-icon-theme-blue
 
 pkgname = tela-circle-icon-theme-brown-git
+	pkgdesc = A flat colorful design icon theme (brown variant)
+	conflicts = tela-circle-icon-theme-brown
 
 pkgname = tela-circle-icon-theme-green-git
+	pkgdesc = A flat colorful design icon theme (green variant)
+	conflicts = tela-circle-icon-theme-green
 
 pkgname = tela-circle-icon-theme-grey-git
+	pkgdesc = A flat colorful design icon theme (grey variant)
+	conflicts = tela-circle-icon-theme-grey
 
 pkgname = tela-circle-icon-theme-orange-git
+	pkgdesc = A flat colorful design icon theme (orange variant)
+	conflicts = tela-circle-icon-theme-orange
 
 pkgname = tela-circle-icon-theme-pink-git
+	pkgdesc = A flat colorful design icon theme (pink variant)
+	conflicts = tela-circle-icon-theme-pink
 
 pkgname = tela-circle-icon-theme-purple-git
+	pkgdesc = A flat colorful design icon theme (purple variant)
+	conflicts = tela-circle-icon-theme-purple
 
 pkgname = tela-circle-icon-theme-red-git
+	pkgdesc = A flat colorful design icon theme (red variant)
+	conflicts = tela-circle-icon-theme-red
 
 pkgname = tela-circle-icon-theme-yellow-git
+	pkgdesc = A flat colorful design icon theme (yellow variant)
+	conflicts = tela-circle-icon-theme-yellow
 
 pkgname = tela-circle-icon-theme-manjaro-git
+	pkgdesc = A flat colorful design icon theme (manjaro variant)
+	conflicts = tela-circle-icon-theme-manjaro
 
 pkgname = tela-circle-icon-theme-ubuntu-git
+	pkgdesc = A flat colorful design icon theme (ubuntu variant)
+	conflicts = tela-circle-icon-theme-ubuntu
 
 pkgname = tela-circle-icon-theme-dracula-git
+	pkgdesc = A flat colorful design icon theme (dracula variant)
+	conflicts = tela-circle-icon-theme-dracula
 
 pkgname = tela-circle-icon-theme-nord-git
+	pkgdesc = A flat colorful design icon theme (nord variant)
+	conflicts = tela-circle-icon-theme-nord
diff --git a/PKGBUILD b/PKGBUILD
index 0633af807ef1..147ab820fd63 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -13,7 +13,7 @@ arch=('any')
 license=('GPL3')
 makedepends=('bash' 'git')
 depends=('gtk-update-icon-cache' 'hicolor-icon-theme')
-provides=("${_pkgbase}" "${_pkgbase}-git")
+provides=("${_pkgbase}")
 options=(!strip !debug)
 source=("${_pkgbase}::git+${url}.git")
 b2sums=('SKIP')
@@ -23,26 +23,24 @@ pkgver() {
   git describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g'
 }
 
-package_tela-circle-icon-theme-all-git() {
-  pkgdesc="${pkgdesc} (all variants)"
-  conflicts=(${pkgname[@]/${pkgbase%-git}-all-git} "${pkgname[@]/%-git/}")
-
+_package() {
   cd "${_pkgbase}"
   install -dm755 "${pkgdir}/usr/share/icons"
-  ./install.sh -a -d "${pkgdir}/usr/share/icons"
+  ./install.sh -d "${pkgdir}/usr/share/icons" ${1}
 }
 
-_package() {
-  pkgdesc="${pkgdesc} (${1} variant)"
-  conflicts=("${_pkgbase}-all-git" "${_pkgbase}-all" "${_pkgbase}-${1}")
+package_tela-circle-icon-theme-all-git() {
+  pkgdesc="${pkgdesc} (all variants)"
+  conflicts=("${_pkgbase}" "${_pkgbase}"-all)
 
-  cd "${_pkgbase}"
-  install -dm755 "${pkgdir}/usr/share/icons"
-  ./install.sh -d "${pkgdir}/usr/share/icons" "${1}"
+  _package -a
 }
 
 for _theme in "${_themes[@]}"; do
   eval "package_${_pkgbase}-${_theme}-git() {
-    _package ${_theme}
+    pkgdesc='${pkgdesc} (${_theme} variant)'
+    conflicts=(${_pkgbase}-${_theme})
+
+    _package '${_theme}'
   }"
 done