Author: assaf
Date: Tue Feb 19 12:54:35 2008
New Revision: 629226
URL: http://svn.apache.org/viewvc?rev=629226&view=rev
Log:
Revised usage for JRuby
Modified:
incubator/buildr/trunk/doc/pages/download.textile
incubator/buildr/trunk/doc/scripts/install-jruby.sh
Modified: incubator/buildr/trunk/doc/pages/download.textile
URL:
http://svn.apache.org/viewvc/incubator/buildr/trunk/doc/pages/download.textile?rev=629226&r1=629225&r2=629226&view=diff
==============================================================================
--- incubator/buildr/trunk/doc/pages/download.textile (original)
+++ incubator/buildr/trunk/doc/pages/download.textile Tue Feb 19 12:54:35 2008
@@ -200,34 +200,28 @@
dependencies). If you want to use Buildr with both, you must install it
separately for each one.
-If you installed JRuby but don't have Ruby installed on your machine, the @gem@
-command will install Buildr for JRuby, and the @buildr@ command will run Buildr
-using JRuby.
-
-Note that some operating systems, specifically OS/X and various flavors of
-Linux, come with Ruby pre-installed, you can check this out by running the
[EMAIL PROTECTED]@ command.
-
-You can use the @PATH@ environment variable to determine which one is used by
-default. The instructions above show you how to place JRuby first on the
[EMAIL PROTECTED]@, afterwhich you can install and use Buildr for JRuby.
-
-If you need to use both versions together, you can pick Ruby or JRuby and run
-the various commands using the @-S@ argument. For example, to install and run
-Buildr for JRuby, even though Ruby appears first on the @PATH@:
+If you installed JRuby on your machine and do not have Ruby installed, the
[EMAIL PROTECTED]@ and @buildr@ commands will default to using JRuby. However,
you may
+already have Ruby installed (some operating systems come with Ruby
+pre-installed), in which case these commands will default to whichever is first
+on the path.
+
+To work exclusively with JRuby, make sure it shows first on the path, for
example,
+by setting @PATH=/opt/jruby/bin:[EMAIL PROTECTED] Alternatively, you can run
scripts with a particular version
+of Ruby using the @-S@ command line argument. For example:
{{{!
+$ # with Ruby
+$ ruby -S gem install buildr
+$ ruby -S buildr
+$ # with JRuby
$ jruby -S gem install buildr
$ jruby -S buildr
}}}
-To find out which version you are currently running:
-
-{{{!
-$ buildr help
-}}}
-
-When running on JRuby you will see @(JRuby)@ next to Buildr version number.
+To find out which version of Buildr you are using by default, run @buildr
[EMAIL PROTECTED] Buildr reports the version number and adds @(JRuby)@ next to
it when
+running on JRuby.
h2. Binaries and Source Code
Modified: incubator/buildr/trunk/doc/scripts/install-jruby.sh
URL:
http://svn.apache.org/viewvc/incubator/buildr/trunk/doc/scripts/install-jruby.sh?rev=629226&r1=629225&r2=629226&view=diff
==============================================================================
--- incubator/buildr/trunk/doc/scripts/install-jruby.sh (original)
+++ incubator/buildr/trunk/doc/scripts/install-jruby.sh Tue Feb 19 12:54:35 2008
@@ -11,9 +11,9 @@
rm jruby-bin-${version}.tar.gz
export PATH=$PATH:${target}
if [ -e ~/.bash_profile ] ; then
- echo "export PATH=\$PATH:${target}/bin" >> ~/.bash_profile
+ echo "export PATH=${target}/bin:\$PATH" >> ~/.bash_profile
elif [ -e ~/.profile ] ; then
- echo "export PATH=\$PATH:${target}/bin" >> ~/.profile
+ echo "export PATH=${target}/bin:\$PATH" >> ~/.profile
else
echo "You need to add ${target}/bin to the PATH"
fi
