1 files changed, 28 insertions, 35 deletions
diff --git a/system/apache-cassandra/apache-cassandra.SlackBuild b/system/apache-cassandra/apache-cassandra.SlackBuild
index 674ac3ea78..c29685266c 100644
--- a/system/apache-cassandra/apache-cassandra.SlackBuild
+++ b/system/apache-cassandra/apache-cassandra.SlackBuild
@@ -1,8 +1,8 @@
 #!/bin/sh
+# Slackware build script for apache-cassandra
 #
-# Slackware build script for apache-cassandra-bin
-
 # Copyright 2010  Manlio Modugno <manliomodugno -# #- gmail-# #- com>
+# Copyright 2014  Mario Antunes
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,12 +24,12 @@
 
 # based on apache-tomcat.SlackBuild by Heinz Wiesinger and Vincent Batts
 
-PRGNAM=apache-cassandra
-VERSION=0.6.12
-BUILD=${BUILD:-2}
+PRGNAM="apache-cassandra"
+VERSION=${VERSION:-2.0.7}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
-ARCH=noarch
+ARCH="noarch"
 
 CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
@@ -46,54 +46,47 @@ tar xvf $CWD/$PRGNAM-$VERSION-bin.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
 mkdir -p $PKG/opt/$PRGNAM
-mkdir -p $PKG/etc/$PRGNAM
-mkdir -p $PKG/var/log/cassandra
-mkdir -p $PKG/var/lib/cassandra
+mkdir -p $PKG/var/log/$PRGNAM
+mkdir -p $PKG/etc/{profile.d,rc.d}
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+
 rm -f bin/*.bat
 
-#####
-cp -rf conf/* interface     $PKG/etc/$PRGNAM
-cp -rf bin lib 		    $PKG/opt/$PRGNAM
-mkdir -p $PKG/etc/{profile.d,rc.d}
+cp -rf bin conf interface lib pylib tools $PKG/opt/$PRGNAM
 cp $CWD/rc.cassandra $PKG/etc/rc.d/rc.cassandra.new
-cp -f $CWD/cassandra.in.sh $PKG/etc/$PRGNAM/cassandra.in.sh.new
-mv $PKG/etc/apache-cassandra/storage-conf.xml \
-   $PKG/etc/apache-cassandra/storage-conf.xml.new
+
+cp -a CHANGES.txt  LICENSE.txt  NEWS.txt  NOTICE.txt  README.txt \
+  $PKG/usr/doc/$PRGNAM-$VERSION
+cp -rf javadoc $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 cat << EOF > $PKG/etc/profile.d/$PRGNAM.csh
 #!/bin/csh
-setenv CASSANDRA_HOME /opt/$PRGNAM
-setenv CASSANDRA_CONF /etc/$PRGNAM
-setenv CASSANDRA_INCLUDE "\$CASSANDRA_CONF/cassandra.in.sh"
+setenv CASSANDRA_HOME="/opt/$PRGNAM"
+setenv CASSANDRA_CONF="\$CASSANDRA_HOME/conf"
+setenv CASSANDRA_INCLUDE="\$CASSANDRA_HOME/tools/bin/cassandra.in.sh"
+setenv PATH="\$PATH:\$CASSANDRA_HOME/bin"
 EOF
 
 cat << EOF > $PKG/etc/profile.d/$PRGNAM.sh
 #!/bin/sh
-export CASSANDRA_HOME=/opt/$PRGNAM
-export CASSANDRA_CONF=/etc/$PRGNAM
-export CASSANDRA_INCLUDE="\$CASSANDRA_CONF/cassandra.in.sh"
+export CASSANDRA_HOME="/opt/$PRGNAM"
+export CASSANDRA_CONF="\$CASSANDRA_HOME/conf"
+export CASSANDRA_INCLUDE="\$CASSANDRA_HOME/tools/bin/cassandra.in.sh"
+export PATH="\$PATH:\$CASSANDRA_HOME/bin"
 EOF
 
 chmod 0755 $PKG/etc/profile.d/*
 
-# Documentation
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a CHANGES.txt  LICENSE.txt  NEWS.txt  NOTICE.txt  README.txt \
-  $PKG/usr/doc/$PRGNAM-$VERSION
-cp -rf javadoc $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-
-####
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
 /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
-