From ecdcf7cd36f37f304e1231dce38a69b45817f473 Mon Sep 17 00:00:00 2001 From: Tristan Sloughter Date: Fri, 22 Jan 2016 15:23:03 -0600 Subject: add support for setting erl vm args with REBAR3_ERL_ARGS --- src/rebar_prv_local_install.erl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/rebar_prv_local_install.erl b/src/rebar_prv_local_install.erl index 65468a3..66702cf 100644 --- a/src/rebar_prv_local_install.erl +++ b/src/rebar_prv_local_install.erl @@ -60,7 +60,7 @@ format_error(Reason) -> bin_contents(OutputDir) -> <<"#!/usr/bin/env sh -erl -pz ", (ec_cnv:to_binary(OutputDir))/binary,"/*/ebin +sbtu +A0 -noshell -boot start_clean -s rebar3 main -extra \"$@\" +erl -pz ", (ec_cnv:to_binary(OutputDir))/binary,"/*/ebin +sbtu +A0 -noshell -boot start_clean -s rebar3 main $REBAR3_ERL_ARGS -extra \"$@\" ">>. extract_escript(State, ScriptPath) -> -- cgit v1.1 From 42113a03647d72cd4a900bb840372d2333a75abe Mon Sep 17 00:00:00 2001 From: Tristan Sloughter Date: Fri, 22 Jan 2016 15:23:27 -0600 Subject: move unstable install and upgrade to local namespace --- README.md | 4 ++-- src/rebar_prv_local_install.erl | 2 +- src/rebar_prv_local_upgrade.erl | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 843c4cb..0fa486a 100644 --- a/README.md +++ b/README.md @@ -74,13 +74,13 @@ Stable versions can be obtained from the [releases page](https://github.com/reba The rebar3 escript can also extract itself with a run script under the user's home directory: ```bash -$ ./rebar3 unstable install +$ ./rebar3 local install ===> Extracting rebar3 libs to ~/.cache/rebar3/lib... ===> Writing rebar3 run script ~/.cache/rebar3/bin/rebar3... ===> Add to $PATH for use: export PATH=$PATH:~/.cache/rebar3/bin ``` -To keep it up to date after you've installed rebar3 this way you can use `rebar3 unstable upgrade` which +To keep it up to date after you've installed rebar3 this way you can use `rebar3 local upgrade` which fetches the latest nightly and extracts to the same place as above. Rebar3 may also be available on various OS-specific package managers such as diff --git a/src/rebar_prv_local_install.erl b/src/rebar_prv_local_install.erl index 66702cf..1b58859 100644 --- a/src/rebar_prv_local_install.erl +++ b/src/rebar_prv_local_install.erl @@ -15,7 +15,7 @@ -include_lib("kernel/include/file.hrl"). -define(PROVIDER, install). --define(NAMESPACE, unstable). +-define(NAMESPACE, local). -define(DEPS, []). %% =================================================================== diff --git a/src/rebar_prv_local_upgrade.erl b/src/rebar_prv_local_upgrade.erl index bdfc232..aa9ee44 100644 --- a/src/rebar_prv_local_upgrade.erl +++ b/src/rebar_prv_local_upgrade.erl @@ -14,7 +14,7 @@ -include_lib("kernel/include/file.hrl"). -define(PROVIDER, upgrade). --define(NAMESPACE, unstable). +-define(NAMESPACE, local). -define(DEPS, []). %% =================================================================== -- cgit v1.1