From b7c8c04ec261afc01b99e71db174d945f93632de Mon Sep 17 00:00:00 2001 From: Tristan Sloughter Date: Thu, 22 May 2014 12:29:36 -0500 Subject: remove quoting that breaks start scripts --- priv/templates/bin.dtl | 4 ++-- priv/templates/extended_bin.dtl | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/priv/templates/bin.dtl b/priv/templates/bin.dtl index 4434552..de44fe1 100755 --- a/priv/templates/bin.dtl +++ b/priv/templates/bin.dtl @@ -17,7 +17,7 @@ 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)" + local erl_root=$("$erl" -noshell -eval "io:format(\"~s\", [code:root_dir()])." -s init stop) ERTS_DIR="$erl_root/erts-$ERTS_VSN" ROOTDIR="$erl_root" fi @@ -59,4 +59,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..c2fd297 100644 --- a/priv/templates/extended_bin.dtl +++ b/priv/templates/extended_bin.dtl @@ -19,7 +19,7 @@ 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)" + local erl_root=$("$erl" -noshell -eval "io:format(\"~s\", [code:root_dir()])." -s init stop) ERTS_DIR="$erl_root/erts-$ERTS_VSN" ROOTDIR="$erl_root" fi -- cgit v1.2.3 From b74765f541d3ad0f3c7a236732d9b001dac16404 Mon Sep 17 00:00:00 2001 From: nuex Date: Fri, 23 May 2014 09:36:36 -0400 Subject: remove extra escape; ensures correct erts dir with or without spaces --- priv/templates/extended_bin.dtl | 2 ++ 1 file changed, 2 insertions(+) diff --git a/priv/templates/extended_bin.dtl b/priv/templates/extended_bin.dtl index c2fd297..22e6199 100644 --- a/priv/templates/extended_bin.dtl +++ b/priv/templates/extended_bin.dtl @@ -20,6 +20,8 @@ find_erts_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 -- cgit v1.2.3 From 72b8e4ea49b5cf8b45dd3f7c0ec9c7ec6622a6c0 Mon Sep 17 00:00:00 2001 From: nuex Date: Fri, 23 May 2014 09:47:18 -0400 Subject: add erts_dir fix to bin directory, remove extranneous erl_root declaration in extended_bin --- priv/templates/bin.dtl | 3 ++- priv/templates/extended_bin.dtl | 1 - 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/priv/templates/bin.dtl b/priv/templates/bin.dtl index de44fe1..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 diff --git a/priv/templates/extended_bin.dtl b/priv/templates/extended_bin.dtl index 22e6199..bb3e8d7 100644 --- a/priv/templates/extended_bin.dtl +++ b/priv/templates/extended_bin.dtl @@ -19,7 +19,6 @@ 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" -- cgit v1.2.3