Merge pull request #94 from dlanza1/dlanza

Make service run even if bin/zkEnv.sh does not exist
deric · Apr 6, 2017 · 75cec7d · 75cec7d
2 parents 03879ae + fa0c96a
commit 75cec7d
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/templates/zookeeper.service.erb b/templates/zookeeper.service.erb
@@ -14,7 +14,7 @@ After=<%= scope.lookupvar("zookeeper::systemd_unit_after") %>
 ExecStart=/bin/sh -c 'set -x; \
   . <%= scope.lookupvar("zookeeper::cfg_dir") %>/<%= scope.lookupvar("zookeeper::environment_file") %>; \
   CLASSPATH="<%= @_zoo_dir %>/zookeeper<% if scope.lookupvar('zookeeper::install_method') == 'archive' -%>-<%= scope.lookupvar("zookeeper::archive_version") %><% end -%>.jar:<%= @_zoo_dir %>/lib/*:$CLASSPATH"; \
-  CLASSPATH="$(. <%= scope.lookupvar("zookeeper::service::_zoo_dir") %>/bin/zkEnv.sh ; echo $CLASSPATH)"; \
+  CLASSPATH="$([ -r <%= scope.lookupvar("zookeeper::service::_zoo_dir") %>/bin/zkEnv.sh ] && . <%= scope.lookupvar("zookeeper::service::_zoo_dir") %>/bin/zkEnv.sh ; echo $CLASSPATH)"; \
   mkdir -p <%= scope.lookupvar("zookeeper::log_dir") %>; \
   $JAVA "-Dzookeeper.log.dir=<%= scope.lookupvar("zookeeper::log_dir") %>" "-Dzookeeper.root.logger=$ZOO_LOG4J_PROP" -cp "$CLASSPATH" $JAVA_OPTS "$ZOOMAIN" "$ZOOCFG"'
 Restart=always