Update to 6.2.0, fixed PID file location.

4 files changed, 14 insertions, 13 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 1dd81a45f16c..f676009fd2e7 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = artifactory-oss
 	pkgdesc = Artifactory is an advanced Binary Repository Manager for use by build tools, dependency management tools and build servers
-	pkgver = 5.11.0
+	pkgver = 6.2.0
 	pkgrel = 1
 	url = https://bintray.com/jfrog/product/JFrog-Artifactory-Oss/view
 	install = artifactory-oss.install
@@ -10,14 +10,14 @@ pkgbase = artifactory-oss
 	depends = net-tools
 	depends = bash
 	options = !strip
-	source = jfrog-artifactory-oss-5.11.0.zip::https://bintray.com/jfrog/artifactory/download_file?file_path=jfrog-artifactory-oss-5.11.0.zip
+	source = jfrog-artifactory-oss-6.2.0.zip::https://bintray.com/jfrog/artifactory/download_file?file_path=jfrog-artifactory-oss-6.2.0.zip
 	source = artifactory.service
 	source = artifactory.conf
 	source = artifactory.default
-	sha256sums = 8b00705d5ce6b8321fd1a623a80cea24fbf2fd8545672c72778e7c918405b6dc
-	sha256sums = 5ffe6fc1cfd8b52276cfa8c191c90526f79ad0d000d893e7acb7d30f9004601b
+	sha256sums = 45c08f56159a82c0b2f72832bac6af0dfcef14b6672356f3b78640fdd2fb9480
+	sha256sums = 8ba1287f4d062f57a5cf9e5426d4affcfcc00ca2680cd603f41c603957a42c20
 	sha256sums = 48bc1cddf9fa64f0d62a519470a490719398d67b6baeef6a3e647b737d6484df
-	sha256sums = 1ce98bff3733c965889cd851c43a7f993161fbb9001b79dcd3ea17a29c380129
+	sha256sums = 34337e72bbdca63a3244a61d3d1aad324c473782d976da68b72ff72ed38ac5e5
 
 pkgname = artifactory-oss
 
diff --git a/PKGBUILD b/PKGBUILD
index 771c1cefdf03..ac3dd0e60eda 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,8 @@
+# Maintainer: Michael J. Pento <mjpento@verizon.net>
 # Maintainer: Yegorius <yegorius@domic.us>
 
 pkgname=artifactory-oss
-pkgver=5.11.0
+pkgver=6.2.0
 pkgrel=1
 pkgdesc='Artifactory is an advanced Binary Repository Manager for use by build tools, dependency management tools and build servers'
 arch=('any')
@@ -13,16 +14,16 @@ source=("jfrog-artifactory-oss-${pkgver}.zip::https://bintray.com/jfrog/artifact
         'artifactory.service'
         'artifactory.conf'
         'artifactory.default')
-sha256sums=('8b00705d5ce6b8321fd1a623a80cea24fbf2fd8545672c72778e7c918405b6dc'
-            '5ffe6fc1cfd8b52276cfa8c191c90526f79ad0d000d893e7acb7d30f9004601b'
+sha256sums=('45c08f56159a82c0b2f72832bac6af0dfcef14b6672356f3b78640fdd2fb9480'
+            '8ba1287f4d062f57a5cf9e5426d4affcfcc00ca2680cd603f41c603957a42c20'
             '48bc1cddf9fa64f0d62a519470a490719398d67b6baeef6a3e647b737d6484df'
-            '1ce98bff3733c965889cd851c43a7f993161fbb9001b79dcd3ea17a29c380129')
+            '34337e72bbdca63a3244a61d3d1aad324c473782d976da68b72ff72ed38ac5e5')
 options=('!strip')
 PKGEXT='.pkg.tar'
 
 package() {
   local artdir="/opt/artifactory"
-  
+
   pushd "$pkgname-$pkgver"
   rm -f bin/*.{exe,bat}
   rm -f bin/{install,uninstall}Service.sh
@@ -30,7 +31,7 @@ package() {
   rm -f tomcat/bin/*.bat
   rm -f COPYING* *.txt *.html
   popd
-  
+
   install -d "$pkgdir$artdir"
   cp -r "$pkgname-$pkgver"/* "$pkgdir$artdir"
   install -Dm644 "$srcdir/artifactory.conf" "$pkgdir/usr/lib/sysusers.d/artifactory.conf"
diff --git a/artifactory.default b/artifactory.default
index d1d210c06630..c5f58261218d 100755
--- a/artifactory.default
+++ b/artifactory.default
@@ -7,7 +7,7 @@ export JAVA_HOME=/usr/lib/jvm/default
 #export REPLICATOR_ENABLED=true
 
 export TOMCAT_HOME=$ARTIFACTORY_HOME/tomcat
-export ARTIFACTORY_PID=/run/artifactory.pid
+export ARTIFACTORY_PID=/opt/artifactory/run/artifactory.pid
 
 export JAVA_OPTIONS='-server -Xms512m -Xmx2g -Xss256k -XX:+UseG1GC -XX:OnOutOfMemoryError="kill -9 %p"'
 export JAVA_OPTIONS="$JAVA_OPTIONS -Djruby.compile.invokedynamic=false -Dfile.encoding=UTF8 -Dartdist=zip -Dorg.apache.tomcat.util.buf.UDecoder.ALLOW_ENCODED_SLASH=true -Djava.security.egd=file:/dev/urandom"
diff --git a/artifactory.service b/artifactory.service
index 90f5b3a4dd42..16ee655b1cd8 100644
--- a/artifactory.service
+++ b/artifactory.service
@@ -6,7 +6,7 @@ After=network.target
 Type=forking
 ExecStart=/opt/artifactory/bin/artifactory.sh start
 ExecStop=/opt/artifactory/bin/artifactory.sh stop
-PIDFile=/run/artifactory.pid
+PIDFile=/opt/artifactory/run/artifactory.pid
 Restart=no
 TimeoutSec=30
 RemainAfterExit=yes