aboutsummaryrefslogtreecommitdiffstats
path: root/priv
diff options
context:
space:
mode:
authorJordan Wilberding <[email protected]>2014-05-24 10:22:03 +0200
committerJordan Wilberding <[email protected]>2014-05-24 10:22:03 +0200
commit23d3d777a4fe67b661a7be0fa5a8ef3e30a48ef1 (patch)
tree06c4e638dd36d8a47984017bfb8045324d97c1e7 /priv
parent69daf475a9219b0c400a686d17590143ecd037ae (diff)
parent2751586ac8748d6443b9e544d6932952fef08cab (diff)
downloadrelx-23d3d777a4fe67b661a7be0fa5a8ef3e30a48ef1.tar.gz
relx-23d3d777a4fe67b661a7be0fa5a8ef3e30a48ef1.tar.bz2
relx-23d3d777a4fe67b661a7be0fa5a8ef3e30a48ef1.zip
Merge pull request #190 from tsloughter/start_scripts
remove quoting that breaks start scripts
Diffstat (limited to 'priv')
-rwxr-xr-xpriv/templates/bin.dtl5
-rw-r--r--priv/templates/extended_bin.dtl3
2 files changed, 5 insertions, 3 deletions
diff --git a/priv/templates/bin.dtl b/priv/templates/bin.dtl
index 4434552..60bbe68 100755
--- a/priv/templates/bin.dtl
+++ b/priv/templates/bin.dtl
@@ -17,7 +17,8 @@ find_erts_dir() {
ROOTDIR="$RELEASE_ROOT_DIR"
else
local erl="$(which erl)"
- local erl_root="$("$erl" -noshell -eval "io:format(\\"~s\\", [code:root_dir()])." -s init stop)"
+ code="io:format(\"~s\", [code:root_dir()])."
+ local erl_root="$("$erl" -noshell -eval "$code" -s init stop)"
ERTS_DIR="$erl_root/erts-$ERTS_VSN"
ROOTDIR="$erl_root"
fi
@@ -59,4 +60,4 @@ set -- "$ERL_OPTS"
set -- "$@" -boot "$REL_DIR/$REL_NAME" "$ARGS"
# Boot the release
-"$BINDIR/erlexec" "$@"
+$BINDIR/erlexec $@
diff --git a/priv/templates/extended_bin.dtl b/priv/templates/extended_bin.dtl
index 99014fd..bb3e8d7 100644
--- a/priv/templates/extended_bin.dtl
+++ b/priv/templates/extended_bin.dtl
@@ -19,7 +19,8 @@ find_erts_dir() {
ROOTDIR="$RELEASE_ROOT_DIR"
else
local erl="$(which erl)"
- local erl_root="$("$erl" -noshell -eval "io:format(\\"~s\\", [code:root_dir()])." -s init stop)"
+ code="io:format(\"~s\", [code:root_dir()])."
+ local erl_root="$("$erl" -noshell -eval "$code" -s init stop)"
ERTS_DIR="$erl_root/erts-$ERTS_VSN"
ROOTDIR="$erl_root"
fi