From 6379cafa04f4f8eeb06b932c3ac0eabbde5d0197 Mon Sep 17 00:00:00 2001
From: "DiMichel, Kevin" <Kevin.DiMichel@Pearson.com>
Date: Tue, 8 Jul 2014 12:28:41 -0600
Subject: [PATCH] Updated for storm 0.9.2.  Added script to install
 dependencies.  Fixed build_jzmq.sh for execution.

---
 build_jzmq.sh          |  4 ++++
 build_storm.sh         | 31 +++++++++++++++++--------------
 install_prequisites.sh | 19 +++++++++++++++++++
 storm.postrm           |  2 +-
 4 files changed, 41 insertions(+), 15 deletions(-)
 create mode 100644 install_prequisites.sh

diff --git a/build_jzmq.sh b/build_jzmq.sh
index dcc00d1..b3208e2 100755
--- a/build_jzmq.sh
+++ b/build_jzmq.sh
@@ -34,6 +34,10 @@ if [ $(cat /etc/lsb-release|grep -i release|grep 12\.) ]; then
   curl -L -v -s https://github.com/nathanmarz/jzmq/pull/2.patch 2>/dev/null | patch -p
 fi
 # Build package
+touch ${origdir}/tmp/jzmq/src/classdist_noinst.stamp
+cd src
+CLASSPATH=.:./.:$CLASSPATH javac -d . org/zeromq/ZMQ.java org/zeromq/ZMQException.java org/zeromq/ZMQQueue.java org/zeromq/ZMQForwarder.java org/zeromq/ZMQStreamer.java
+cd ..
 ./autogen.sh
 ./configure --prefix=${prefix}
 make
diff --git a/build_storm.sh b/build_storm.sh
index deee946..60336ef 100755
--- a/build_storm.sh
+++ b/build_storm.sh
@@ -1,14 +1,15 @@
 #!/bin/bash
 set -x
-name=storm
-version=0.8.1
+name=apache-storm
+version=0.9.2-incubating
 description="Storm is a distributed realtime computation system. Similar to how Hadoop provides a set of general primitives for doing batch processing, Storm provides a set of general primitives for doing realtime computation. Storm is simple, can be used with any programming language, is used by many companies, and is a lot of fun to use!"
 url="http://storm-project.net"
 arch="all"
 section="misc"
 package_version=""
-src_package="storm-${version}.zip"
-download_url="https://github.com/downloads/nathanmarz/storm/${src_package}"
+src_package="apache-storm-${version}.tar.gz"
+#download_url="https://github.com/downloads/nathanmarz/storm/${src_package}"
+download_url="http://mirrors.ibiblio.org/apache/incubator/storm/apache-storm-0.9.2-incubating/apache-storm-0.9.2-incubating.tar.gz"
 origdir="$(pwd)"
 storm_root_dir=/usr/lib/storm
 
@@ -26,8 +27,8 @@ fi
 # Make build directory, save location
 mkdir -p tmp && pushd tmp
 # Create build structure for package
-mkdir -p storm
-cd storm
+mkdir -p ${name}
+cd ${name}
 mkdir -p build${storm_root_dir}
 mkdir -p build/etc/default
 mkdir -p build/etc/storm
@@ -36,11 +37,12 @@ mkdir -p build/etc/init.d
 mkdir -p build/var/log/storm
 
 # Explode downloaded archive & cleanup files
-unzip ${origdir}/storm-${version}.zip
-rm -rf storm-${version}/logs
-rm -rf storm-${version}/log4j
-rm -rf storm-${version}/conf
-cp -R storm-${version}/* build${storm_root_dir}
+#unzip ${origdir}/storm-${version}.zip
+tar -xzvf ${origdir}/${name}-${version}.tar.gz
+rm -rf ${name}-${version}/logs
+rm -rf ${name}-${version}/log4j
+rm -rf ${name}-${version}/conf
+cp -R ${name}-${version}/* build${storm_root_dir}
 
 # Copy default files into build structure
 cd build
@@ -52,9 +54,9 @@ cp ${origdir}/storm-nimbus.conf ${origdir}/storm-supervisor.conf ${origdir}/stor
 for f in etc/init/*; do f=$(basename $f); f=${f%.conf}; ln -s /lib/init/upstart-job etc/init.d/$f; done
 
 #_ MAKE DEBIAN _#
-cd build
+#cd build
 fpm -t deb \
-    -n $name \
+    -n storm \
     -v ${version}${package_version} \
     --description "$description" \
     --before-install ${origdir}/storm.preinst \
@@ -66,5 +68,6 @@ fpm -t deb \
     -d "libzmq1 >= 2.1.7" -d "libjzmq >= 2.1.7" \
     -s dir \
     -- .
-mv ${name}*.deb ${origdir}
+#mv ${name}*.deb ${origdir}
+mv storm*.deb ${origdir}
 popd
diff --git a/install_prequisites.sh b/install_prequisites.sh
new file mode 100644
index 0000000..b06c24d
--- /dev/null
+++ b/install_prequisites.sh
@@ -0,0 +1,19 @@
+#https://github.com/phobos182/storm-deb-packaging
+#http://stackoverflow.com/questions/12115160/compiling-jzmq-on-ubuntu
+
+# install perquisite software - misc
+apt-get update
+sudo apt-get install -f git pkg-config libtool automake autoconf gcc gawk g++ uuid-dev libpgm-5.1-0 ruby-dev -y
+
+# autoreconf
+gem install fpm
+
+# install perquisite software - zeromq
+mkdir -p /var/tmp; cd /var/tmp
+mkdir zeromq; cd zeromq
+wget http://download.zeromq.org/zeromq-4.0.4.tar.gz
+tar -xzvf zeromq-4.0.4.tar.gz
+cd zeromq-4.0.4/
+./configure
+make
+make install
\ No newline at end of file
diff --git a/storm.postrm b/storm.postrm
index 52c7055..176b19b 100644
--- a/storm.postrm
+++ b/storm.postrm
@@ -1,7 +1,7 @@
 #!/bin/sh
 set -e
 
-/usr/sbin/deluser storm
+trap '/usr/sbin/deluser storm' 2
 
 #DEBHELPER#