Browse files

Removed -G, --archives, --src path options in preparation for consoli…

…dation and "system vs user".
  • Loading branch information...
1 parent d1506a9 commit 7e39507ed91f29a906a63e177e29a96c744054cb @wayneeseguin wayneeseguin committed Sep 10, 2010
Showing with 6 additions and 43 deletions.
  1. +2 −5 README
  2. +0 −4 examples/rvmrc
  3. +0 −18 scripts/cli
  4. +4 −2 scripts/manage
  5. +0 −14 scripts/utility
View
7 README
@@ -23,11 +23,8 @@ Options
-l|--level - patch level to use with rvm use / install
--prefix - path for all rvm files (~/.rvm/), with trailing slash!
--bin - path for binaries to be placed (~/.rvm/bin/)
- --source - src directory to use (~/.rvm/src/)
- --archives - directory for downladed files (~/.rvm/archives/)
-S - Specify a script file to attempt to load and run (rubydo)
-e - Execute code from the command line.
- -G - root gem path to use
--gems - Used to set the 'gems_flag', use with 'remove' to remove gems
--archive - Used to set the 'archive_flag', use with 'remove' to remove archive
--patch - With MRI Rubies you may specify one or more full paths to patches
@@ -74,12 +71,12 @@ Action
specified ruby and gemset combination. Used under the hood for
passenger support and the like.
- cleanup - Lets you remove stale source folders / archives and other miscellaneous
+ cleanup - Lets you remove stale source folders / archives and other miscellaneous
data associated with rvm.
repair - Lets you repair parts of your environment e.g. wrappers, env files and
and similar files (e.g. general maintenance).
snapshot - Lets your backup / restore an rvm installation in a lightweight manner.
-
+
disk-usage - Tells you how much disk space rvm install is using.
tools - Provides general information about the ruby environment,
primarily useful when scripting rvm.
View
4 examples/rvmrc
@@ -12,10 +12,6 @@
# This is where rvm installs and manages everything in by default.
#export rvm_path="$HOME/.rvm"
-# Archives Path
-# This is where all tarballs/zipfiles/packagefiles are downladed to
-#export rvm_archives_path="${rvm_path}/archives"
-
# Source Path
# This is where rvm extracts to for compiling & installing.
#export rvm_source_path="${rvm_path}/src"
View
18 scripts/cli
@@ -359,24 +359,6 @@ __rvm_parse_args() {
rvm_parse_break=1
;;
- -G)
- path_variable="rvm_gems_path"
- __rvm_set_path_variable "$next_token"
- if [[ $# -gt 0 ]] ; then next_token="$1" ; shift ; else next_token="" ; fi
- ;;
-
- --source)
- path_variable="rvm_src_path"
- __rvm_set_path_variable "$next_token"
- if [[ $# -gt 0 ]] ; then next_token="$1" ; shift ; else next_token="" ; fi
- ;;
-
- --archives)
- path_variable="rvm_archives_path"
- __rvm_set_path_variable "$next_token"
- if [[ $# -gt 0 ]] ; then next_token="$1" ; shift ; else next_token="" ; fi
- ;;
-
-h|--help|usage)
rvm_action=help
;;
View
6 scripts/manage
@@ -1053,10 +1053,12 @@ RubyWrapper
;;
default)
- "$rvm_scripts_path/log" "fail" "must specify a ruby interpreter to install."
+ "$rvm_scripts_path/log" "fail" \
+ "a ruby interpreter to install must be specified and not simply 'default'."
;;
- *) "$rvm_scripts_path/log" "fail" "Ruby interpreter '$rvm_ruby_interpreter' is not known."
+ *) "$rvm_scripts_path/log" "fail" \
+ "Ruby interpreter '$rvm_ruby_interpreter' is not known."
esac
View
14 scripts/utility
@@ -200,20 +200,6 @@ __rvm_push() {
return 0
}
-__rvm_set_path_variable() {
-
- if [[ -d "$1" ]] ; then
- eval "${path_variable}=${1}"
-
- else
- "$rvm_scripts_path/log" "error" \
- "'$1' is not a valid path."
- unset path_variable
- fi
-
- return 0
-}
-
# Clean all *duplicate* items out of the path. (keep first occurrence of each)
__rvm_clean_path() {
PATH="$(echo $PATH | \tr -s ':' '\n' | awk '!($0 in a){a[$0];print}' | \tr -s '\n' ':' | sed 's#:$##')"

0 comments on commit 7e39507

Please sign in to comment.