Rebar is now installed in the proper bin dir.

This fixes issue lfe-deprecated#28.

Author: oubiwann

bash-complete

@@ -5,7 +5,7 @@ INSTALL='lfetool autocomplete lfe erlang kerl rebar relx expm erjang'
 YAWS='default bootstrap'
 TESTS='build unit integration system all'
 UPDATE='lfetool deps'
-INFO='version erllibs path installdir'
+INFO='version erllibs path installdir bindir'
 REPL='lfe erlang jlfe jerl'
 
 _get-lfetool-opts-and-commands () {

doc/manual/info.rst

@@ -7,6 +7,8 @@
 
 The ``info`` command supports the following sub-commands:
 
+* ``bindir``
+
 * ``erllibs``
 
 * ``path``
@@ -16,6 +18,17 @@ The ``info`` command supports the following sub-commands:
 * ``version``
 
 
+``info bindir``
+,,,,,,,,,,,,,,,
+
+This command returns the ``bin`` directory for the installed/active version
+of Erlang:
+
+.. code:: shell
+
+    $ lfetool info bindir
+
+
 ``info erllibs``
 ,,,,,,,,,,,,,,,
 
@@ -38,8 +51,9 @@ any needed binaries. It also adds some default directories:
 
 * ``/opt/erlang/erjang``
 
-Due to the fact that obtaining the ``lfetool`` PATH settings can be useful for
-debugging or running commands manually, this is provided as a convenience:
+Due to the fact that obtaining the ``lfetool`` PATH settings can be useful
+for debugging or running commands manually, this is provided as a
+convenience:
 
 .. code:: shell
 
@@ -49,9 +63,8 @@ debugging or running commands manually, this is provided as a convenience:
 ``info installdir``
 ,,,,,,,,,,,,,,,,,,,
 
-``lfetool install lfe`` finds the ``lib`` directory for the installed/active
-version of Erlang running and installs LFE there. This command returns the
-install dir for informational purposes:
+This command returns the ``lib`` directory for the installed/active version
+of Erlang:
 
 .. code:: shell
 

doc/manual/install.rst

@@ -167,6 +167,9 @@ used with LFE and LFE projects. Here's how you install it:
 
     $ lfetool install rebar
 
+By default, it is installed into the ``bin`` dir of the currently active
+version of Erlang.
+
 .. code:: bash
 
     $ lfetool install rebar ~/bin/

plugins/lfetool/templates/lfetool.tmpl

@@ -233,11 +233,17 @@ download_file () {
     echo "Download failed."
 }
 
-get_install_dir () {
+get_erl_install_dir () {
     #erl -eval 'io:fwrite(code:lib_dir()), halt().' -run init stop -noshell
     erl -eval 'io:fwrite(re:replace(code:lib_dir(), "~", "~~", [global, {return,list}])), halt().' -run init stop -noshell
 }
 
+get_erl_bin_dir () {
+    installdir=`get_erl_install_dir`
+    basedir=`dirname $installdir`
+    echo "$basedir/bin"
+}
+
 install_file () {
     src=$1
     directory=$2
@@ -294,7 +300,7 @@ install_lfe () {
     cd /tmp/ > /dev/null 2>&1 && \
     clone_repo $url && \
     cd $repo && make compile && \
-    ERL_LIBS=`get_install_dir` make install && \
+    ERL_LIBS=`get_erl_install_dir` make install && \
     cd .. > /dev/null 2>&1 && \
     rm -rf $repo && \
     cd startdir > /dev/null 2>&1
@@ -327,7 +333,7 @@ install_kerl () {
 install_rebar () {
     directory=$1
     if [ x"$directory" = x ]; then
-        directory=/usr/local/bin
+        directory=`get_erl_bin_dir`
     fi
     url="https://github.com/rebar/rebar.git"
     repo=rebar
@@ -1068,7 +1074,10 @@ do_info () {
             get_erl_libs
             ;;
         installdir)
-            get_install_dir
+            get_erl_install_dir
+            ;;
+        bindir)
+            get_erl_bin_dir
             ;;
         path)
             get_path

plugins/lfetool/templates/usage.txt.tmpl

@@ -20,7 +20,7 @@ Currently, {{SCRIPT}} supports these commands (with subcommands nested):
  * repl
    * lfe (or no parameter/empty string), erlang, jlfe, jerl
  * info
-   * erllibs, path, installdir, version
+   * bindir, erllibs, path, installdir, version
 
 Additionally, instead of passing a command, you may choose to run the script
 with one of the following options: