diff options
author | Tristan Sloughter <[email protected]> | 2013-04-09 16:49:49 -0700 |
---|---|---|
committer | Tristan Sloughter <[email protected]> | 2013-04-09 16:49:49 -0700 |
commit | f34308e8f6f08ff3cb260481c7be90e0cbe76078 (patch) | |
tree | db506faa552a61997c08d01f27c785d51bf06eb7 /src/rcl_app_discovery.erl | |
parent | bd20c04683b700027ed75c090c9d4534b40b3d47 (diff) | |
parent | 10eb471cda3609156e21af93e04522543fb674c0 (diff) | |
download | relx-f34308e8f6f08ff3cb260481c7be90e0cbe76078.tar.gz relx-f34308e8f6f08ff3cb260481c7be90e0cbe76078.tar.bz2 relx-f34308e8f6f08ff3cb260481c7be90e0cbe76078.zip |
Merge pull request #51 from ericbmerritt/next
various bugfixes to the system
Diffstat (limited to 'src/rcl_app_discovery.erl')
-rw-r--r-- | src/rcl_app_discovery.erl | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/rcl_app_discovery.erl b/src/rcl_app_discovery.erl index 43557c4..1f1ecc8 100644 --- a/src/rcl_app_discovery.erl +++ b/src/rcl_app_discovery.erl @@ -86,7 +86,7 @@ setup_overrides(State, AppMetas0) -> Overrides = rcl_state:overrides(State), AppMetas1 = [AppMeta || AppMeta <- AppMetas0, not lists:keymember(app_name(AppMeta), 1, Overrides)], - [case is_valid_otp_app(filename:join([FileName, "ebin", + [case is_valid_otp_app(filename:join([FileName, <<"ebin">>, erlang:atom_to_list(AppName) ++ ".app"])) of {noresult, false} -> {error, {invalid_override, AppName, FileName}}; @@ -134,11 +134,11 @@ is_valid_otp_app(File) -> %% Is this an ebin dir? EbinDir = filename:dirname(File), case filename:basename(EbinDir) of - "ebin" -> - case lists:suffix(".app", File) of - true -> + <<"ebin">> -> + case filename:extension(File) of + <<".app">> -> has_at_least_one_beam(EbinDir, File); - false -> + _ -> {noresult, false} end; _ -> |