meta

cass_zk_rmq/build.sh

@@ -3,5 +3,3 @@
 bash boxen/cassandra/build.sh
 bash wynurz.sh zookeeeper
 bash wynurz.sh rabbitmq
-
-

czr_pythons/build.sh

@@ -4,32 +4,10 @@ pip install --upgrade pip==1.5.6
 pip install --upgrade setuptools==5.5.1
 
 
-
-# Oracle Java JRE
-apt-get install -y debconf-utils
-echo "deb http://ppa.launchpad.net/webupd8team/java/ubuntu trusty main" > /etc/apt/sources.list.d/webupd8team-java.list
-echo "deb-src http://ppa.launchpad.net/webupd8team/java/ubuntu trusty main" >> /etc/apt/sources.list.d/webupd8team-java.list
-apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys EEA14886
-apt-get update
-echo debconf shared/accepted-oracle-license-v1-1 select true |  debconf-set-selections
-apt-get install -y oracle-java8-installer
-
-# Install Apache Cassandra
-echo "deb http://debian.datastax.com/community stable main" > /etc/apt/sources.list.d/cassandra.sources.list
-curl -L http://debian.datastax.com/debian/repo_key | apt-key add -
-apt-get update
-apt-get install -y cassandra=3.0.9 dsc30 cassandra-tools
-
 # Install RabbitMQ
-apt-get install -y rabbitmq-server=3.3.5-1.1
-
-service rabbitmq-server stop
-
-# Install ZooKeeper
-apt-get install -y zookeeper zookeeperd
-
-service zookeeper stop
-bash assaassinate_cassandra.sh
+$(bash wynurz.sh java &&
+bash wynurz.sh cassandra &&
+bash wynurz.sh rabbitmq &&
+bash wynurz.sh zookeeper) &
 
-# Python modules
 pip install cassandra-driver kazoo CoolAMQP requests futures six monotonic nose mock

make.py

@@ -41,8 +41,7 @@ build_$BOX:
     - cd ..
 '''.replace('$BOX', box).replace('$PREFIX', 'henrietta/'))
 
-    if sys.argv[1] == 'meta':
-
+    if ' '.join(sys.argv).endswith('meta'):
 
         with open('DESCRIPTION', 'rb') as mdin, open('metadata.json', 'wb') as mdout:
             description = mdin.read().strip()