dependency-check-cli: 6.2.2

2 files changed, 20 insertions, 22 deletions

diff --git a/PKGBUILD b/PKGBUILD
index ac0f60bec587..db8f6258537d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,24 +1,23 @@
-# Maintainer: François-Xavier Bru <francoisxavier.bru at orange dot com>
+# Maintainer: robertfoster
+# Contributor: François-Xavier Bru <francoisxavier.bru at orange dot com>
+
 pkgname=dependency-check-cli
-_pkgname=dependency-check
-pkgver=6.1.5
+pkgver=6.2.2
 pkgrel=1
 pkgdesc="Dependency-Check is a Software Composition Analysis (SCA) tool that attempts to detect publicly disclosed vulnerabilities contained within a project's dependencies."
 arch=('any')
 depends=('java-runtime')
 url="https://github.com/jeremylong/DependencyCheck"
 license=('Apache')
-source=("https://github.com/jeremylong/DependencyCheck/releases/download/v${pkgver}/${_pkgname}-${pkgver}-release.zip")
-sha256sums=('54af1e44491cb283cc31d58340110a2c4b98d9362394dee769a1be3c7749e107')
+source=("https://github.com/jeremylong/DependencyCheck/releases/download/v${pkgver}/${pkgname%%-cli}-${pkgver}-release.zip")
+sha256sums=('90673d1a6ec0c33e01fc38e84c0bdceec1b433e3d50ff514d1e9301407c8ab69')
 install=${pkgname}.install
 
 package() {
-
   install -d "${pkgdir}/usr/bin"
-  install -d "${pkgdir}/opt/${_pkgname}"
+  install -d "${pkgdir}/opt/${pkgname%%-cli}"
 
-  cp -r "${srcdir}/${_pkgname}/"* "${pkgdir}/opt/${_pkgname}"
-  chmod +x ${pkgdir}/opt/${_pkgname}/bin/dependency-check.sh
-  ln -s /opt/${_pkgname}/bin/dependency-check.sh "${pkgdir}"/usr/bin/dependency-check
+  cp -r "${srcdir}/${pkgname%%-cli}/"* "${pkgdir}/opt/${pkgname%%-cli}"
+  chmod +x ${pkgdir}/opt/${pkgname%%-cli}/bin/dependency-check.sh
+  ln -s /opt/${pkgname%%-cli}/bin/dependency-check.sh "${pkgdir}"/usr/bin/dependency-check
 }
-
diff --git a/dependency-check-cli.install b/dependency-check-cli.install
index 4e479e35c41c..f01989dcb7a0 100644
--- a/dependency-check-cli.install
+++ b/dependency-check-cli.install
@@ -1,19 +1,18 @@
 post_install() {
-	groupadd dependencycheck
-	mkdir /opt/dependency-check/data
-	chown -R root:dependencycheck /opt/dependency-check/data
-	chmod -R g+w /opt/dependency-check/data
-	echo "    Users should be added to the 'dependencycheck' group to be able to perform vulnerability database updates."
-	echo "    $ sudo gpasswd -a <username> dependencycheck"
+  groupadd dependencycheck
+  mkdir /opt/dependency-check/data
+  chown -R root:dependencycheck /opt/dependency-check/data
+  chmod -R g+w /opt/dependency-check/data
+  echo "    Users should be added to the 'dependencycheck' group to be able to perform vulnerability database updates."
+  echo "    $ sudo gpasswd -a <username> dependencycheck"
 }
 
 post_upgrade() {
-	mkdir /opt/dependency-check/data
-	chown -R root:dependencycheck /opt/dependency-check/data
-	chmod -R g+w /opt/dependency-check/data
+  chown -R root:dependencycheck /opt/dependency-check/data
+  chmod -R g+w /opt/dependency-check/data
 }
 
 post_remove() {
-	groupdel dependencycheck
-	rm -fr /opt/dependency-check
+  groupdel dependencycheck
+  rm -fr /opt/dependency-check
 }