Skip to content

Commit 3d7c299

Browse files
committed
Rewrite foreground.erb to not require ezbake-functions.sh
1 parent 99263e1 commit 3d7c299

File tree

1 file changed

+7
-13
lines changed
  • resources/puppetlabs/lein-ezbake/template/global/ext/cli

1 file changed

+7
-13
lines changed

resources/puppetlabs/lein-ezbake/template/global/ext/cli/foreground.erb

Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,31 @@
11
#!/usr/bin/env bash
22

33
restartfile="/opt/puppetlabs/server/data/<%= EZBake::Config[:real_name] %>/restartcounter"
4-
cli_defaults=${INSTALL_DIR}/cli/cli-defaults.sh
5-
6-
if [ ! -e "${INSTALL_DIR}/ezbake-functions.sh" ]; then
7-
echo "Unable to find ${INSTALL_DIR}/ezbake-functions.sh script, failing start." 1>&2
8-
exit 1
4+
if [ ! -e "$restartfile" ]; then
5+
printf '0' | /usr/bin/install -D --owner="${USER:-<%= EZBake::Config[:user] %>}" --group="${GROUP:-<%= EZBake::Config[:group] %>}" --mode=0644 "$restartfile"
96
fi
107

11-
. "${INSTALL_DIR}/ezbake-functions.sh"
12-
13-
init_restart_file "$restartfile" || exit $?
14-
15-
if !(echo "${@}" | grep -e "--debug" -q)
8+
if ! (echo "${@}" | grep -e "--debug" -q)
169
then
1710
LOG_APPENDER="-Dlogappender=STDOUT"
1811
fi
1912

2013
CLASSPATH="${INSTALL_DIR}/<%= EZBake::Config[:uberjar_name] %>"
2114

15+
cli_defaults="${INSTALL_DIR}/cli/cli-defaults.sh"
2216
if [ -e "$cli_defaults" ]; then
23-
. $cli_defaults
17+
. "$cli_defaults"
2418
if [ $? -ne 0 ]; then
2519
echo "Unable to initialize cli defaults, failing start." 1>&2
2620
exit 1
2721
fi
2822
fi
2923

3024
COMMAND="${JAVA_BIN} ${JAVA_ARGS} ${LOG_APPENDER} \
31-
-cp "$CLASSPATH" \
25+
-cp '${CLASSPATH}' \
3226
clojure.main -m <%= EZBake::Config[:main_namespace] %> \
3327
--config ${CONFIG} --bootstrap-config ${BOOTSTRAP_CONFIG} \
34-
--restart-file "${restartfile}" \
28+
--restart-file '${restartfile}' \
3529
${TK_ARGS} \
3630
${@}"
3731

0 commit comments

Comments
 (0)