aboutsummaryrefslogtreecommitdiffstats
path: root/priv
diff options
context:
space:
mode:
authorLuis Rascão <[email protected]>2017-09-12 13:22:03 +0100
committerGitHub <[email protected]>2017-09-12 13:22:03 +0100
commit36e0ad410310031cab1bf83d864017f05b45b9cc (patch)
tree8fde99038143e00e3d84e627f01a63803346864d /priv
parent430b1d7f5ab75a849d70c82a98614f701a4912c6 (diff)
parent25196f4b994df5364eb060bff8418a0154622ed4 (diff)
downloadrelx-36e0ad410310031cab1bf83d864017f05b45b9cc.tar.gz
relx-36e0ad410310031cab1bf83d864017f05b45b9cc.tar.bz2
relx-36e0ad410310031cab1bf83d864017f05b45b9cc.zip
Merge pull request #607 from bitnitdit/find_erts_dir_via_boot_no_dot_erlang
Prevent .erlang from prepending string to the erl root dir
Diffstat (limited to 'priv')
-rwxr-xr-xpriv/templates/bin2
-rw-r--r--priv/templates/bin_windows2
-rwxr-xr-xpriv/templates/extended_bin2
-rw-r--r--priv/templates/extended_bin_windows2
4 files changed, 4 insertions, 4 deletions
diff --git a/priv/templates/bin b/priv/templates/bin
index 8bb6890..523b88d 100755
--- a/priv/templates/bin
+++ b/priv/templates/bin
@@ -22,7 +22,7 @@ find_erts_dir() {
else
__erl="$(which erl)"
code="io:format(\"~s\", [code:root_dir()]), halt()."
- __erl_root="$("$__erl" -noshell -eval "$code")"
+ __erl_root="$("$__erl" -boot no_dot_erlang -noshell -eval "$code")"
ERTS_DIR="$__erl_root/erts-$ERTS_VSN"
ROOTDIR="$__erl_root"
fi
diff --git a/priv/templates/bin_windows b/priv/templates/bin_windows
index e66049e..b3ce796 100644
--- a/priv/templates/bin_windows
+++ b/priv/templates/bin_windows
@@ -60,7 +60,7 @@ cd %rootdir%
@for /f "delims=" %%i in ('where erl') do (
set erl=%%i
)
-@set dir_cmd="%erl%" -noshell -eval "io:format(\"~s\", [filename:nativename(code:root_dir())])." -s init stop
+@set dir_cmd="%erl%" -boot no_dot_erlang -noshell -eval "io:format(\"~s\", [filename:nativename(code:root_dir())])." -s init stop
@for /f "delims=" %%i in ('%%dir_cmd%%') do (
set erl_root=%%i
)
diff --git a/priv/templates/extended_bin b/priv/templates/extended_bin
index 71dd858..a48a917 100755
--- a/priv/templates/extended_bin
+++ b/priv/templates/extended_bin
@@ -120,7 +120,7 @@ find_erts_dir() {
else
__erl="$(which erl)"
code="io:format(\"~s\", [code:root_dir()]), halt()."
- __erl_root="$("$__erl" -noshell -eval "$code")"
+ __erl_root="$("$__erl" -boot no_dot_erlang -noshell -eval "$code")"
ERTS_DIR="$__erl_root/erts-$ERTS_VSN"
ROOTDIR="$__erl_root"
fi
diff --git a/priv/templates/extended_bin_windows b/priv/templates/extended_bin_windows
index 139edaa..85c57f4 100644
--- a/priv/templates/extended_bin_windows
+++ b/priv/templates/extended_bin_windows
@@ -98,7 +98,7 @@
@for /f "delims=" %%i in ('where erl') do @(
set erl=%%i
)
-@set dir_cmd="%erl%" -noshell -eval "io:format(\"~s\", [filename:nativename(code:root_dir())])." -s init stop
+@set dir_cmd="%erl%" -boot no_dot_erlang -noshell -eval "io:format(\"~s\", [filename:nativename(code:root_dir())])." -s init stop
@for /f "delims=" %%i in ('%%dir_cmd%%') do @(
set erl_root=%%i
)