summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorMax2018-12-07 17:13:07 +1100
committerMax2018-12-07 17:13:07 +1100
commitf73d38de260ffb70c317ed775ba2f8dbb09a93b2 (patch)
treed400470f4b3a8bf2a24a9f43d43e49fe0785bb3c
parent1623661e50e9b0bbc75588217fd0b1ea590d8a2f (diff)
downloadaur-kairosdb.tar.gz
fixed up PKGBUILD: (/usr/bin/kairos, also stopped extraction from overwriting desired kairosdb binary)
-rw-r--r--.SRCINFO1
-rw-r--r--PKGBUILD16
2 files changed, 10 insertions, 7 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 84c86c08529..e5b898ed509 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -9,6 +9,7 @@ pkgbase = kairosdb
makedepends = deb2targz
depends = cassandra
provides = kairosdb
+ noextract = kairosdb-1.2.2-1.tar.gz
source = https://github.com/kairosdb/kairosdb/releases/download/v1.2.2/kairosdb-1.2.2-1.tar.gz
source = kairosdb.service
source = kairosdb
diff --git a/PKGBUILD b/PKGBUILD
index a3286de2cfa..1e4851f08f1 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -12,26 +12,28 @@ provides=('kairosdb')
source=('https://github.com/kairosdb/kairosdb/releases/download/v1.2.2/kairosdb-1.2.2-1.tar.gz'
'kairosdb.service'
'kairosdb')
+noextract=('kairosdb-1.2.2-1.tar.gz')
md5sums=('269076a61419397b22bc35c6dfa0af17'
'3f957c6bfc4e1206dba09c049baa10a0'
'ab930d18b8f13ee662a1f7d6380573a0')
-build() {
- tar zxvf $srcdir/kairosdb-1.2.2-1.tar.gz
+prepare() {
+ mkdir $srcdir/tarfiles
+ tar zxvf $srcdir/kairosdb-1.2.2-1.tar.gz --directory $srcdir/tarfiles/
}
package() {
sed -i 's/\(kairosdb.service.datastore=org.kairosdb.datastore.h2.H2Module\)/#\1/g' \
- $srcdir/kairosdb/conf/kairosdb.properties
+ $srcdir/tarfiles/kairosdb/conf/kairosdb.properties
sed -i 's/#\(kairosdb.service.datastore=org.kairosdb.datastore.cassandra.CassandraModule\)/\1/g' \
- $srcdir/kairosdb/conf/kairosdb.properties
+ $srcdir/tarfiles/kairosdb/conf/kairosdb.properties
mkdir -p ${pkgdir}/{etc/kairosdb,var/log/kairosdb,opt}
- cp -r $srcdir/kairosdb $pkgdir/opt/kairosdb
+ cp -r $srcdir/tarfiles/kairosdb $pkgdir/opt/kairosdb
install -Dm644 ${srcdir}/kairosdb.service ${pkgdir}/usr/lib/systemd/system/kairosdb.service
- install -Dm644 ${srcdir}/kairosdb/bin/kairosdb.sh ${pkgdir}/opt/kairosdb/bin/kairosdb
- chmod +x ${pkgdir}/opt/kairosdb/bin/kairosdb
+ install -Dm644 ${srcdir}/kairosdb ${pkgdir}/usr/bin/kairosdb
+ chmod +x ${pkgdir}/usr/bin/kairosdb
}
# vim:set ts=2 sw=2 et: