summaryrefslogtreecommitdiff
path: root/system
diff options
context:
space:
mode:
authordsomero <xgizzmo@slackbuilds.org>2011-04-04 21:45:45 -0400
committerRobby Workman <rworkman@slackbuilds.org>2011-04-04 22:06:49 -0500
commit50195a5d978996fdfb9bb49590d9233e6fad20ac (patch)
treef344a6a05d6fbc9416c199eed27038683f5a4fc5 /system
parentcc1c5cf5100e7ed5d15d3bf19d6884509ecaee74 (diff)
downloadslackbuilds-50195a5d978996fdfb9bb49590d9233e6fad20ac.tar.gz
system/apache-cassandra: Updated for version 0.6.12.
Signed-off-by: dsomero <xgizzmo@slackbuilds.org>
Diffstat (limited to 'system')
-rw-r--r--system/apache-cassandra/apache-cassandra.SlackBuild10
-rw-r--r--system/apache-cassandra/apache-cassandra.info6
-rw-r--r--system/apache-cassandra/doinst.sh37
3 files changed, 22 insertions, 31 deletions
diff --git a/system/apache-cassandra/apache-cassandra.SlackBuild b/system/apache-cassandra/apache-cassandra.SlackBuild
index 7e5d6866fe..a6822e1372 100644
--- a/system/apache-cassandra/apache-cassandra.SlackBuild
+++ b/system/apache-cassandra/apache-cassandra.SlackBuild
@@ -25,11 +25,12 @@
# based on apache-tomcat.SlackBuild by Heinz Wiesinger and Vincent Batts
PRGNAM=apache-cassandra
-VERSION=0.6.5
-ARCH=noarch
+VERSION=0.6.12
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
+ARCH=noarch
+
CWD=$(pwd)
TMP=${TMP:-/tmp/SBo}
PKG=$TMP/package-$PRGNAM
@@ -57,12 +58,13 @@ mkdir -p $PKG/var/lib/cassandra
rm -f bin/*.bat
#####
-cp -f $CWD/cassandra.in.sh $PKG/etc/$PRGNAM
cp -rf conf/* interface $PKG/etc/$PRGNAM
cp -rf bin lib $PKG/opt/$PRGNAM
-
mkdir -p $PKG/etc/{profile.d,rc.d}
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
cat << EOF > $PKG/etc/profile.d/$PRGNAM.csh
#!/bin/csh
diff --git a/system/apache-cassandra/apache-cassandra.info b/system/apache-cassandra/apache-cassandra.info
index 5e2f2a57f4..dca144fa6d 100644
--- a/system/apache-cassandra/apache-cassandra.info
+++ b/system/apache-cassandra/apache-cassandra.info
@@ -1,8 +1,8 @@
PRGNAM="apache-cassandra"
-VERSION="0.6.5"
+VERSION="0.6.12"
HOMEPAGE="http://cassandra.apache.org/"
-DOWNLOAD="http://www.apache.org/dist/cassandra/0.6.5/apache-cassandra-0.6.5-bin.tar.gz"
-MD5SUM="2807f5c2e04ead1534a6087087676210"
+DOWNLOAD="http://www.apache.org/dist/cassandra/0.6.12/apache-cassandra-0.6.12-bin.tar.gz"
+MD5SUM="ad8a62259b734a94f52801a4c8036217"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
MAINTAINER="Manlio Modugno"
diff --git a/system/apache-cassandra/doinst.sh b/system/apache-cassandra/doinst.sh
index c7632ed9b2..06483c5804 100644
--- a/system/apache-cassandra/doinst.sh
+++ b/system/apache-cassandra/doinst.sh
@@ -11,29 +11,18 @@ config() {
# Otherwise, we leave the .new copy for the admin to consider...
}
-# Keep same perms on rc.cassandra.new:
-if [ -e etc/rc.d/rc.cassandra ]; then
- cp -a etc/rc.d/rc.cassandra etc/rc.d/rc.cassandra.new.incoming
- cat etc/rc.d/rc.cassandra.new > etc/rc.d/rc.cassandra.new.incoming
- mv etc/rc.d/rc.cassandra.new.incoming etc/rc.d/rc.cassandra.new
-fi
-
-config etc/rc.d/rc.cassandra.new
-
-# Keep same perms on storage-conf.xml.new:
-if [ -e etc/apache-cassandra/storage-conf.xml ]; then
- cp -a etc/apache-cassandra/storage-conf.xml etc/apache-cassandra/storage-conf.xml.new.incoming
- cat etc/apache-cassandra/storage-conf.xml.new > etc/apache-cassandra/storage-conf.xml.new.incoming
- mv etc/apache-cassandra/storage-conf.xml.new.incoming etc/apache-cassandra/storage-conf.xml.new
-fi
-
-config etc/apache-cassandra/storage-conf.xml.new
+preserve_perms() {
+ NEW="$1"
+ OLD="$(dirname $NEW)/$(basename $NEW .new)"
+ if [ -e $OLD ]; then
+ cp -a $OLD ${NEW}.incoming
+ cat $NEW > ${NEW}.incoming
+ mv ${NEW}.incoming $NEW
+ fi
+ config $NEW
+}
-# Keep same perms on cassandra.in.sh.new:
-if [ -e etc/apache-cassandra/cassandra.in.sh ]; then
- cp -a etc/apache-cassandra/cassandra.in.sh etc/apache-cassandra/cassandra.in.sh.new.incoming
- cat etc/apache-cassandra/cassandra.in.sh.new > etc/apache-cassandra/cassandra.in.sh.new.incoming
- mv etc/apache-cassandra/cassandra.in.sh.new.incoming etc/apache-cassandra/cassandra.in.sh.new
-fi
+preserve_perms etc/rc.d/rc.cassandra.new
+preserve_perms etc/apache-cassandra/storage-conf.xml.new
+preserve_perms etc/apache-cassandra/cassandra.in.sh.new
-config etc/apache-cassandra/cassandra.in.sh.new \ No newline at end of file