Update build and tests to reflect latest changes from PR

Author: jbrisbin

README.adoc

@@ -83,18 +83,13 @@ endif::[]
 endif::docker[]
 
 ENV RIAK_VERSION {{riak_version}}
+ENV RIAK_HOME {{riak_home}}
 ifndef::riak_ts[]
 ENV RIAK_FLAVOR KV
 endif::[]
 ifdef::riak_ts[]
 ENV RIAK_FLAVOR TS
 endif::[]
-ifdef::ubuntu,debian[]
-ENV RIAK_HOME /usr/lib/riak
-endif::[]
-ifdef::centos[]
-ENV RIAK_HOME /usr/lib64/riak
-endif::[]
 ifeval::["{pkg_format}" == "tgz"]
 RUN \
   mkdir -p $RIAK_HOME && \
@@ -128,7 +123,7 @@ ifdef::centos[]
 RUN yum groups install -y 'Development Tools'
 RUN yum install -y openssl-devel python-devel libffi-devel python-pip
 endif::[]
-RUN pip install --upgrade pip cryptography riak
+RUN pip install --upgrade pip cryptography pyparsing appdirs riak
 endif::riak_client[]
 
 # Expose default ports
@@ -151,7 +146,7 @@ RUN mkdir -p /etc/riak/schemas
 
 WORKDIR /var/lib/riak
 
-CMD ["$RIAK_HOME/riak-cluster.sh"]
+CMD ["{{riak_home}}/riak-cluster.sh"]
 
 # Clean up APT cache
 RUN rm -rf /var/lib/apt/lists/* /tmp/*

riak-cluster.sh

@@ -46,7 +46,7 @@ $RIAK_ADMIN wait-for-service riak_kv
 # Run all poststart scripts
 POSTSTART=$(find /etc/riak/poststart.d -name *.sh -print | sort)
 for s in $POSTSTART; do
-  . $
+  . $s
 done
 
 # Trap SIGTERM and SIGINT and tail the log file indefinitely

vars.adoc

@@ -1,3 +1,4 @@
+:riak_home: /usr/lib/riak
 :riak_flavor: kv
 ifeval::["{riak_flavor}" == "kv"]
 :!riak_ts:
@@ -50,6 +51,7 @@ ifeval::["{os_family}" == "centos"]
 :!osx:
 :pkg_format: rpm
 :python_lib_dir: /usr/lib/python{python_version}/site-packages
+:riak_home: /usr/lib64/riak
 endif::[]
 ifeval::["{os_family}" == "osx"]
 :!ubuntu: