add erts_dir fix to bin directory, remove extranneous erl_root declar…

…ation in extended_bin
erlware · May 23, 2014 · 72b8e4e · 72b8e4e
1 parent b74765f
commit 72b8e4e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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"