Permalink
Browse files

Updated examples/rvmrc file to be current for the project. Fixed 'rvm…

…_temp_path' to be 'rvm_tmp_path' as expected.
  • Loading branch information...
1 parent 9a0c02f commit 1fb5a06189c14c856bc8bd2279a8efd609efd77c @wayneeseguin wayneeseguin committed Nov 29, 2009
Showing with 50 additions and 39 deletions.
  1. +41 −28 examples/rvmrc
  2. +2 −2 scripts/initialize
  3. +1 −3 scripts/rvm
  4. +6 −6 scripts/utility
View
@@ -1,38 +1,51 @@
-# Example rvm Defaults file.
+# Example ~/.rvmrc file.
+#
# This file shows some examples of setting defaults to your own tastes.
-
-# Default action to assume
-#rvm_action="use"
-
-# Default ruby implementation
-#rvm_implementation="ruby"
-
-# Default ruby version
-#rvm_version="1.8.6"
-
-# Default patchlevel to set, if implementation is set
-#rvm_patchlevel="369"
-
-# Default prefix path (~/, or /usr/local/src/ for example.)
-#rvm_prefix_path="$HOME/."
-
-# Default Install Path
-#rvm_path="${rvm_prefix_path}rvm"
-
-# Default Archives Path
+#
+# If you wish to adjust the default ruby interpreter/version/patchlevel
+# settings they can be found in the $rvm_path/config/db file.
+# Beware that currently that file is overwritten on install so
+# back it up if you change anything.
+#
+
+# rvm Path
+# This is where rvm installs and manages everything in by default.
+#rvm_path="$HOME/.rvm"
+
+# Archives Path
+# This is where all tarballs/zipfiles/packagefiles are downladed to
#rvm_archives_path="${rvm_path}/archives"
-# Default Source Path
+# Source Path
+# This is where rvm extracts to for compiling & installing.
#rvm_source_path="${rvm_path}/src"
-# Default Log Path
+# Log Path
+# This is where rvm logs all of it's actions to
+# (not including the 'do' actions)
#rvm_log_path="${rvm_path}/log"
-# Default gems directory
-# rvm_gem_path="$HOME/.gem"
+# Bin Path
+# This is where rvm places all of it's executable/wrapper scripts.
+#rvm_bin_path="${$rvm_path}/bin"
+
+# Gem Path
+# This is where rvm installs all gems to for each ruby
+# interpreter/version%gemset
+#rvm_gem_path="$rvm_path/.gem"
+
+# Hooks Path
+# This is where rvm rubs custom hook files from.
+#rvm_hooks_path="${rvm_hooks_path:-"$rvm_path/hooks"}"
-# Install rubies on use when they are not installed
+# Temp Path
+# This is where rvm stores all of its temporary files.
+#rvm_tmp_path="${rvm_tmp_path:-"$rvm_path/tmp"}"
+
+# Install On Use Flag
+# Install rubies when used if are not installed.
#ruby_install_on_use=1
-# Make Flags, I have 2 cpu's so I can do 2 make threads:
-#rvm_make_flags="-j 2"
+# Make Flags, I have 8 cpu's so I might use 7 make threads:
+#rvm_make_flags="-j 7"
+
View
@@ -14,7 +14,7 @@ rvm_bin_path="${rvm_bin_path:-"$rvm_path/bin"}"
rvm_gem_path="${rvm_gem_path:-"$rvm_path/gems"}"
rvm_config_path="${rvm_config_path:-"$rvm_path/config"}"
rvm_hooks_path="${rvm_hooks_path:-"$rvm_path/hooks"}"
-rvm_temp_path="${rvm_temp_path:-"$rvm_path/tmp"}"
+rvm_tmp_path="${rvm_tmp_path:-"$rvm_path/tmp"}"
-export rvm_path rvm_scripts_path rvm_archives_path rvm_src_path rvm_log_path rvm_bin_path rvm_gem_path rvm_config_path rvm_temp_path
+export rvm_path rvm_scripts_path rvm_archives_path rvm_src_path rvm_log_path rvm_bin_path rvm_gem_path rvm_config_path rvm_tmp_path
View
@@ -1,10 +1,9 @@
#!/usr/bin/env bash
-#
# rvm : Ruby Version Manager
# http://rvm.beginrescueend.com
# http://gitub.com/wayneeseguin/rvm
-#
+
if [[ "$rvm_loaded_flag" != "1" ]] || [[ "$rvm_reload_flag" = "1" ]] ; then
if [[ -f /etc/rvmrc ]] ; then source /etc/rvmrc ; fi
if [[ -f "$HOME/.rvmrc" ]] ; then source "$HOME/.rvmrc" ; fi
@@ -39,7 +38,6 @@ if [[ "$rvm_loaded_flag" != "1" ]] || [[ "$rvm_reload_flag" = "1" ]] ; then
cd() { builtin cd "$@" ; if [[ -f .rvmrc ]] ; then source .rvmrc ; fi ; }
alias rvm-restart="source '${rvm_path}/scripts/rvm'"
-
fi
# Ok now we determine if we were called or sourced... under assumption of course ;)
View
@@ -368,7 +368,7 @@ __rvm_initialize() {
PATH=$rvm_bin_path:$PATH ; export PATH
fi
- mkdir -p $rvm_src_path $rvm_bin_path $rvm_archives_path $rvm_gem_path $rvm_temp_path
+ mkdir -p $rvm_src_path $rvm_bin_path $rvm_archives_path $rvm_gem_path $rvm_tmp_path
}
__rvm_update() {
@@ -570,14 +570,14 @@ __rvm_json() {
__rvm_benchmark() {
code="require \"benchmark\" \n Benchmark.bmbm do |benchmark| \n benchmark.report(\"${rvm_ruby_file}\") do \n"
- echo -e "$code" > "$rvm_temp_path/$$.rb"
+ echo -e "$code" > "$rvm_tmp_path/$$.rb"
unset code
- cat $rvm_ruby_file >> "$rvm_temp_path/$$.rb"
- echo -e "\n end \nend\n" >> "$rvm_temp_path/$$.rb"
- rvm_ruby_args="$rvm_temp_path/$$.rb"
+ cat $rvm_ruby_file >> "$rvm_tmp_path/$$.rb"
+ echo -e "\n end \nend\n" >> "$rvm_tmp_path/$$.rb"
+ rvm_ruby_args="$rvm_tmp_path/$$.rb"
rvm_benchmark_flag=1
rvm_action="ruby"
- if [[ ! -z "$rvm_debug_flag" ]] ; then echo -e "$rvm_temp_path/$$.rb:\n$(cat $rvm_temp_path/$$.rb)" ; fi
+ if [[ ! -z "$rvm_debug_flag" ]] ; then echo -e "$rvm_tmp_path/$$.rb:\n$(cat $rvm_tmp_path/$$.rb)" ; fi
__rvm_do
}

0 comments on commit 1fb5a06

Please sign in to comment.