Clean up, mv instead of cp

2 files changed, 15 insertions, 17 deletions

diff --git a/.SRCINFO b/.SRCINFO
index b231ff72e713..c61ad30cf53c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,13 +1,14 @@
 pkgbase = application-inspector-bin
 	pkgdesc = Microsoft ApplicationInspector is a source code analyzer built for surfacing features of interest and other characteristics to answer the question 'what's in it' using static analysis with a json based rules engine (official CLI binary version)
 	pkgver = 1.9.10
-	pkgrel = 1
+	pkgrel = 2
 	url = https://github.com/microsoft/ApplicationInspector
 	install = application-inspector-bin.install
 	arch = x86_64
 	license = MIT
 	depends = dotnet-runtime
 	provides = application-inspector
+	conflicts = application-inspector
 	options = staticlibs
 	source = https://github.com/microsoft/ApplicationInspector/releases/download/v1.9.10/ApplicationInspector_linux_1.9.10.zip
 	sha256sums = a040b2d88033cd8a20b4a081a6bba446d7c4d8c5e8a3e54dbff12ae225c9d322
diff --git a/PKGBUILD b/PKGBUILD
index d7a28ef0cdc1..5ebad8a2d019 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,31 +1,28 @@
 # Maintainer: begin-theadventure <begin-thecontact.ncncb at dralias dot com>
 # Contributor: François-Xavier Bru <francoisxavier.bru at orange dot com>
 
-pkgname=application-inspector-bin
 _pkgname=application-inspector
+pkgname=$_pkgname-bin
 pkgver=1.9.10
-pkgrel=1
+pkgrel=2
 pkgdesc="Microsoft ApplicationInspector is a source code analyzer built for surfacing features of interest and other characteristics to answer the question 'what's in it' using static analysis with a json based rules engine (official CLI binary version)"
 arch=('x86_64')
 url="https://github.com/microsoft/ApplicationInspector"
 license=('MIT')
-provides=('application-inspector')
 depends=(dotnet-runtime)
+conflicts=($_pkgname)
+provides=($_pkgname)
 options=(staticlibs)
-source=(https://github.com/microsoft/ApplicationInspector/releases/download/v${pkgver}/ApplicationInspector_linux_${pkgver}.zip)
+source=($url/releases/download/v$pkgver/ApplicationInspector_linux_$pkgver.zip)
 sha256sums=('a040b2d88033cd8a20b4a081a6bba446d7c4d8c5e8a3e54dbff12ae225c9d322')
-install=${pkgname}.install
+install=$pkgname.install
 
 package() {
-  _pkg=ApplicationInspector_linux_${pkgver}
-
-  install -d "${pkgdir}/usr/bin"
-  install -d "${pkgdir}/opt/${_pkgname}"
-
-  cp -r "${srcdir}/${_pkg}/"* "${pkgdir}/opt/${_pkgname}"
-  chmod -R g+w "${pkgdir}/opt/${_pkgname}"
-  chmod +x ${pkgdir}/opt/${_pkgname}/ApplicationInspector.CLI
-  ln -s /opt/${_pkgname}/ApplicationInspector.CLI "${pkgdir}"/usr/bin/ApplicationInspector
-  ln -s /opt/${_pkgname}/ApplicationInspector.CLI "${pkgdir}"/usr/bin/application-inspector
+  # Create folders
+  mkdir -p "$pkgdir/opt/ApplicationInspector" "$pkgdir/usr/bin"
+  # Install
+  mv ApplicationInspector_linux_$pkgver/* "$pkgdir/opt/ApplicationInspector"
+  chmod -R g+w "$pkgdir/opt/ApplicationInspector"
+  chmod +x "$pkgdir/opt/ApplicationInspector/ApplicationInspector.CLI"
+  ln -s /opt/ApplicationInspector/ApplicationInspector.CLI "$pkgdir/usr/bin/$_pkgname"
 }
-