Other improvement

1 files changed, 20 insertions, 16 deletions

diff --git a/PKGBUILD b/PKGBUILD
index fecb93a1d793..861d5bbe322b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,32 +1,37 @@
-# Maintainer: Aleksander Boiko <brdcom@ya.ru>
+# Maintainer: Aleksandr <contact at via dot aur>
 pkgname=bginetaccounting
 _basename=bgbilling
 _pkgname=BGInetAccounting
-_major=7.0
-_minor=39
+_major=7.1
+_minor=48
 pkgver=$_major.$_minor
-pkgrel=2
+pkgrel=1
 pkgdesc="Accounting server for BGBilling"
 arch=('i686' 'x86_64') 
 url="http://bgbilling.ru"
 license=('custom')
-depends=('bgbilling')
+depends=('jdk8')
 makedepends=('unzip' 'dos2unix')
-source=("ftp://bgbilling.ru/pub/${_basename}/${_major}/data/${_pkgname}_${_major}_${_minor}.zip"
-        'bginetaccounting.service')
+source=("ftp://bgbilling.ru/pub/${_basename}/${_major}/data/${_pkgname}_${_major}_${_minor}.zip")
+
+prepare() {
+  sed -i 's|#JAVA_HOME=|JAVA_HOME=/usr/lib/jvm/java-8-jdk|' \
+  "./${_pkgname}/setenv.sh"
+}
 
 package() {
-  install -d -m0755 ${pkgdir}/opt
-  mv ./${_pkgname} ${pkgdir}/opt/${pkgname}
+  install -d -m0755 ${pkgdir}/opt/${_basename}
+  mv ./${_pkgname} ${pkgdir}/opt/${_basename}/
 
-  install -D -m 644 $pkgname.service "$pkgdir/usr/lib/systemd/system/$pkgname.service"
+  install -D -m 644 ${pkgdir}/opt/${_basename}/${_pkgname}/script/inet-accounting.service "$pkgdir/usr/lib/systemd/system/$pkgname.service"
   
 # putting the appropriate access rights to the startup scripts
-  cd ${pkgdir}/opt/${pkgname}
-  chmod 0744 *.sh
+  cd ${pkgdir}/opt/${_basename}/${_pkgname}
+  chmod +x *.sh
+  chmod +x script/*.sh
 
 # patch
-  patch -p0 <"${srcdir}/setenv.sh.patch"
+#  patch -p0 <"${srcdir}/setenv.sh.patch"
 
 # converting files to Unix format
   dos2unix *.sh
@@ -37,9 +42,8 @@ package() {
   rm -rf *.exe
 
 # remove junk files
-  rm -rf ./script
+  #rm -rf ./script
 }
 
 # vim:set ts=2 sw=2 ft=sh et:
-md5sums=('d8c2b7c7345586deab2d108b5b57f64d'
-         'd16caf1cc2f0701d3e4625ce21075a50')
+md5sums=('593f6b959f374169326c0a15b49b9c6e')