Replaced variable, $_pkgname, with its value, solr, as its use isn't coupled with the reserved variable, $pkgname.

2 files changed, 7 insertions, 8 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 21ae19fc1f6a..b2727730eeb4 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
 # Generated by mksrcinfo v8
-# Wed Feb  3 03:07:22 UTC 2016
+# Wed Feb  3 03:39:29 UTC 2016
 pkgbase = solr-undertow
 	pkgdesc = Solr / SolrCloud running in high performance server
 	pkgver = 1.6.0_BETA_1
diff --git a/PKGBUILD b/PKGBUILD
index 665d759da519..8008ca8fe631 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,9 +1,8 @@
 # Maintainer: James An <james@jamesan.ca>
 
-_pkgname=solr
-pkgname="$_pkgname-undertow"
+pkgname=solr-undertow
 pkgver=1.6.0_BETA_1
-pkgrel=1
+pkgrel=2
 pkgdesc='Solr / SolrCloud running in high performance server'
 arch=('i686' 'x86_64' 'any')
 url="https://github.com/kohesive/$pkgname"
@@ -40,16 +39,16 @@ package() {
   for lib in $(basename --multiple lib/*); do
     install -Dm644 lib/$lib "$pkgdir/usr/share/java/$pkgname/$lib"
   done
-  for conf in $(basename --multiple example/$_pkgname-home/*); do
-    install -Dm644 "example/$_pkgname-home/$conf" "$pkgdir/etc/$_pkgname/$conf"
+  for conf in $(basename --multiple example/solr-home/*); do
+    install -Dm644 "example/solr-home/$conf" "$pkgdir/etc/solr/$conf"
   done
   for doc in $(basename --multiple example/*.conf); do
     install -Dm644 "example/$doc" "$pkgdir/usr/share/doc/$pkgname/$doc"
   done
 
-  install -Dm644 ../default.conf "$pkgdir/etc/$_pkgname/default.conf"
+  install -Dm644 ../default.conf "$pkgdir/etc/solr/default.conf"
   install -Dm644 "../$pkgname.service" "$pkgdir/usr/lib/systemd/system/$pkgname.service"
   install -dm755 "$pkgdir/var/log/$pkgname"
 
-  chown -R 521:521 "$pkgdir/etc/$_pkgname" "$pkgdir/var/log/$pkgname"
+  chown -R 521:521 "$pkgdir/etc/solr" "$pkgdir/var/log/$pkgname"
 }