diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/rlx_dscv_util.erl | 7 | ||||
| -rw-r--r-- | src/rlx_prv_assembler.erl | 6 |
2 files changed, 4 insertions, 9 deletions
diff --git a/src/rlx_dscv_util.erl b/src/rlx_dscv_util.erl index a4a265c..aa642b8 100644 --- a/src/rlx_dscv_util.erl +++ b/src/rlx_dscv_util.erl @@ -110,11 +110,8 @@ discover_dir(ProcessDir, File, symlink) -> discover_real_symlink_dir(ProcessDir, File) end. -discover_real_symlink_dir(ProcessDir, File) -> - {ok, CurCwd} = file:get_cwd(), - ok = file:set_cwd(File), - {ok, ActualRealDir} = file:get_cwd(), - ok = file:set_cwd(CurCwd), +discover_real_symlink_dir(ProcessDir, File) -> + {ok, ActualRealDir} = file:read_link(File), case lists:prefix(iolist_to_list(filename:absname(ActualRealDir)), iolist_to_list(filename:absname(File))) of true -> diff --git a/src/rlx_prv_assembler.erl b/src/rlx_prv_assembler.erl index d7bf3f1..47d96aa 100644 --- a/src/rlx_prv_assembler.erl +++ b/src/rlx_prv_assembler.erl @@ -316,9 +316,7 @@ write_bin_file(State, Release, OutputDir, RelDir) -> NodeTool = filename:join([BinDir, "nodetool"]), InstallUpgrade = filename:join([BinDir, "install_upgrade.escript"]), ok = file:write_file(NodeTool, NodeToolFile), - ok = file:write_file(InstallUpgrade, InstallUpgradeFile), - ok = file:change_mode(NodeTool, 8#755), - ok = file:change_mode(InstallUpgrade, 8#755); + ok = file:write_file(InstallUpgrade, InstallUpgradeFile); false -> ok end, @@ -702,7 +700,7 @@ ensure_not_exist(RelConfPath) -> erl_script(ErtsVsn) -> render(erl_script_dtl, [{erts_vsn, ErtsVsn}]). - + bin_file_contents(OsFamily, RelName, RelVsn, ErtsVsn, ErlOpts) -> Template = case OsFamily of unix -> bin_dtl; |