From 838776326b47d3e951babfbcd8870d9bc6353a9f Mon Sep 17 00:00:00 2001
From: Tuncer Ayaz <tuncer.ayaz@gmail.com>
Date: Tue, 30 Dec 2014 17:41:45 +0100
Subject: [PATCH] Fix #415 (reltool vsn check)

* Refactor reltool version check to use vsn app key if ebin/reltool.app
  exists.

  OTP releases prior to R14 didn't install the app file, so we still
  have to support getting the version string from the lib_dir path. If
  you're using an R13B03 or R13B04 install that doesn't have version
  strings in lib_dir paths (lib/reltool vs lib/reltool-0.5.3), we won't
  be able to retrieve the version string. Given R13's age and that it's
  unusual to have vsn-less lib_dir paths, this shouldn't be a problem.

* While at it, delete trailing white space.
---
 src/rebar_reltool.erl | 37 +++++++++++++++++++++++++++++++++++--
 1 file changed, 35 insertions(+), 2 deletions(-)

diff --git a/src/rebar_reltool.erl b/src/rebar_reltool.erl
index fdaa7e0..0e46f84 100644
--- a/src/rebar_reltool.erl
+++ b/src/rebar_reltool.erl
@@ -117,7 +117,7 @@ check_vsn() ->
             ?ABORT("Reltool support requires the reltool application "
                    "to be installed!", []);
         Path ->
-            ReltoolVsn = filename:basename(Path),
+            ReltoolVsn = reltool_vsn(Path),
             case ReltoolVsn < "reltool-0.5.2" of
                 true ->
                     ?ABORT("Reltool support requires at least reltool-0.5.2; "
@@ -127,6 +127,39 @@ check_vsn() ->
             end
     end.
 
+reltool_vsn(ReltoolPath) ->
+    AppFile = filename:join([ReltoolPath, "ebin", "reltool.app"]),
+    case filelib:is_regular(AppFile) of
+        true ->
+            reltool_vsn_from_app();
+        false ->
+            reltool_vsn_from_path(ReltoolPath)
+    end.
+
+reltool_vsn_from_app() ->
+    ok = case application:load(reltool) of
+             ok ->
+                 ok;
+             {error, {already_loaded, reltool}} ->
+                 ok
+         end,
+    {ok, Vsn} = application:get_key(reltool, vsn),
+    "reltool-" ++ Vsn.
+
+%% NOTE: OTP releases prior to R14B did not install
+%% lib/reltool-x.y.z/ebin/reltool.app. Therefore, if we cannot find the app
+%% file, we have to resort to getting the version string from reltool's lib_dir
+%% path. This usually works, but as reported in
+%% https://github.com/rebar/rebar/issues/415 there can be installations without
+%% version strings in lib_dir paths. Given R13's age and that it's unusual to
+%% have vsn-less lib_dir paths, this shouldn't be a problem.
+%%
+%% TODO: Once we require at least R14B04 (didn't check for existence of
+%% ebin/reltool.app in R14 releases older than R14B04), simplify reltool_vsn/1
+%% to get the version string only from the app key.
+reltool_vsn_from_path(ReltoolPath) ->
+    filename:basename(ReltoolPath).
+
 process_overlay(Config, ReltoolConfig) ->
     TargetDir = rebar_rel_utils:get_target_dir(Config, ReltoolConfig),
 
@@ -166,7 +199,7 @@ overlay_vars(Config, Vars0, ReltoolConfig) ->
     BaseVars = load_vars_file([proplists:get_value(overlay_vars, ReltoolConfig)]),
     OverlayVars = rebar_config:get_global(Config, overlay_vars, []),
     OverrideVars = load_vars_file(string:tokens(OverlayVars, ",")),
-    M = fun merge_overlay_var/3, 
+    M = fun merge_overlay_var/3,
     dict:merge(M, dict:merge(M, Vars0, BaseVars), OverrideVars).
 
 merge_overlay_var(_Key, _Base, Override) -> Override.