diff --git a/install b/install new file mode 100755 index 0000000..ea0b8b1 --- /dev/null +++ b/install @@ -0,0 +1,11 @@ +#!/bin/bash + +# Fail on first error +set -e + +## Compile +erlc -I include -o ebin src/*.erl + +## Use application installer to perform actual installation +## into erlang distro +priv/rebar install diff --git a/src/rebar_app_installer.erl b/src/rebar_app_installer.erl index ae723c5..0d1e986 100644 --- a/src/rebar_app_installer.erl +++ b/src/rebar_app_installer.erl @@ -49,20 +49,20 @@ install(Config, File) -> %% continue if it's set case rebar_config:get_global(force, "0") of "0" -> - ?ERROR("~s already exists. Installation failed."), + ?ERROR("~s already exists. Installation failed.", []), ?FAIL; "1" -> - ?WARN("~s already exists, but forcibly overwriting."), + ?WARN("~s already exists, but forcibly overwriting.", []) end; false -> ok - end, + end. %% Wipe out any previous versions - ok = rebar_file_utils:rm_rf(Appdir), +% ok = rebar_file_utils:rm_rf(Appdir), %% Re-create target - ok = rebar_file_utils:mkdir_p(AppDir), +% ok = rebar_file_utils:mkdir_p(AppDir). %% By default we copy the ebin, include, src and priv directories diff --git a/src/rebar_core.erl b/src/rebar_core.erl index a18370e..926303d 100644 --- a/src/rebar_core.erl +++ b/src/rebar_core.erl @@ -26,6 +26,8 @@ -export([run/1]). +-include("rebar.hrl"). + %% =================================================================== %% Public API %% =================================================================== @@ -57,7 +59,7 @@ run(Args) -> update_code_path(Targets), %% Finally, apply the specified command to each target - apply_commands(Targets, Commands) + apply_commands(Targets, Commands). %% ===================================================================