Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixed: #524. Erts src folder existence check added #525

Merged
merged 1 commit into from
Oct 18, 2016
Merged

Fixed: #524. Erts src folder existence check added #525

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions src/rlx_prv_assembler.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -507,7 +507,11 @@ include_erts(State, Release, OutputDir, RelDir) ->
true -> ok;
false ->
SrcDir = filename:join([LocalErts, "src"]),
ok = ec_file:remove(SrcDir, [recursive])
%% ensure the src folder exists before deletion
case ec_file:exists(SrcDir) of
true -> ok = ec_file:remove(SrcDir, [recursive]);
false -> ok
end
end,

case rlx_state:get(State, extended_start_script, false) of
Expand Down Expand Up @@ -567,7 +571,7 @@ make_boot_script_variables(State) ->
% (dictated by erl.ini [erlang] Rootdir=) and so a boot variable is made
% pointing to the release directory
% On non-Windows, $ROOT is set by the ROOTDIR environment variable as the
% release directory, so a boot variable is made pointing to the erts
% release directory, so a boot variable is made pointing to the erts
% directory.
% NOTE the boot variable can point to either the release/erts root directory
% or the release/erts lib directory, as long as the usage here matches the
Expand Down