diff options
| author | nuex <[email protected]> | 2014-05-23 09:47:18 -0400 |
|---|---|---|
| committer | nuex <[email protected]> | 2014-05-23 09:47:18 -0400 |
| commit | 72b8e4ea49b5cf8b45dd3f7c0ec9c7ec6622a6c0 (patch) | |
| tree | fc47ee4fa45f5592eae83e8b11508cc9f2b46f01 | |
| parent | b74765f541d3ad0f3c7a236732d9b001dac16404 (diff) | |
| download | relx-72b8e4ea49b5cf8b45dd3f7c0ec9c7ec6622a6c0.tar.gz relx-72b8e4ea49b5cf8b45dd3f7c0ec9c7ec6622a6c0.tar.bz2 relx-72b8e4ea49b5cf8b45dd3f7c0ec9c7ec6622a6c0.zip | |
add erts_dir fix to bin directory, remove extranneous erl_root declaration in extended_bin
| -rwxr-xr-x | priv/templates/bin.dtl | 3 | ||||
| -rw-r--r-- | 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" |