scripts/gems in rvm-0.0.75 vs scripts/gems in rvm-0.0.76
- old
+ new
@@ -1,31 +1,7 @@
#!/bin/bash
-__rvm_gems() {
- unset GEM_PATH
- if [[ -z "$rvm_ruby_selected_flag" ]] ; then __rvm_select $* ; fi
-
- if [[ ! -z "$rvm_clear_flag" ]] ; then
- __rvm_gems_clear
- elif [[ ! -z "$rvm_load_flag" ]] ; then
- __rvm_gems_load
- elif [[ ! -z "$rvm_dump_flag" ]] ; then
- __rvm_gems_dump
- elif [[ ! -z "$rvm_delete_flag" ]] ; then
- __rvm_gems_delete
- elif [[ ! -z "$rvm_name_flag" ]] ; then
- __rvm_gems_name
- elif [[ ! -z "$rvm_dir_flag" ]] ; then
- __rvm_gems_dir
- elif [[ ! -z "$rvm_list_flag" ]] ; then
- __rvm_gems_list
- #elif [[ ! -z "$rvm_use_flag" ]] ; then
- else
- __rvm_gems_use
- fi
-}
-
__rvm_gems_select() {
if [[ -z "$rvm_gem_set_name" ]] ; then
if [[ ! -z "$GEM_HOME" ]] ; then
rvm_gem_set_name=$(echo $GEM_HOME | xargs basename | awk -F'%' '{print $2}')
fi
@@ -152,11 +128,11 @@
if [[ -f "$rvm_file_name" ]] ; then
echo "Loading $rvm_file_name file..."
rvm_ruby_gem_list=$(\ls $rvm_ruby_gem_home/specifications/ 2> /dev/null | sed 's#.gems.*$##' 2> /dev/null)
- while read line
+ while read -r line
do # Keep this on 2nd line :(
# TODO: Switch to a different field separator than ; to allow for evals
gem="$(echo $line | awk -F';' '{print $1}')"
gem_prefix="$(echo $line | awk -F';' '{print $2}')"
if match "$gem" "\.gem$" ; then
@@ -235,8 +211,46 @@
fi
unset gem gem_prefix gem_name gem_version gem_file_name gem_postfix cache_file gem_file_name gem_string
done < <(awk '/^[\.\/a-zA-Z]/{print}' "$rvm_file_name")
else
__rvm_log "error" "$rvm_file_name does not exist to load from."
+ fi
+}
+
+__rvm_gemdir() {
+ if [[ "$rvm_user_flag" -eq 1 ]] ; then
+ echo $(rvm system ; gem env | grep $HOME | awk '{print $NF}')
+ elif [[ "$rvm_system_flag" -eq 1 ]] ; then
+ echo $(rvm system ; gem env gemdir system)
+ elif [[ ! -z "$rvm_ruby_string" ]] ; then
+ echo $(rvm "$rvm_ruby_string" ; gem env gemdir)
+ elif [[ ! -z "$GEM_HOME" ]] ; then
+ echo "$GEM_HOME"
+ else
+ gem env gemdir
+ fi
+}
+
+__rvm_gems() {
+ unset GEM_PATH
+ if [[ -z "$rvm_ruby_selected_flag" ]] ; then __rvm_select $* ; fi
+
+ if [[ ! -z "$rvm_clear_flag" ]] ; then
+ __rvm_gems_clear
+ elif [[ ! -z "$rvm_load_flag" ]] ; then
+ __rvm_gems_load
+ elif [[ ! -z "$rvm_dump_flag" ]] ; then
+ __rvm_gems_dump
+ elif [[ ! -z "$rvm_delete_flag" ]] ; then
+ __rvm_gems_delete
+ elif [[ ! -z "$rvm_name_flag" ]] ; then
+ __rvm_gems_name
+ elif [[ ! -z "$rvm_dir_flag" ]] ; then
+ __rvm_gems_dir
+ elif [[ ! -z "$rvm_list_flag" ]] ; then
+ __rvm_gems_list
+ #elif [[ ! -z "$rvm_use_flag" ]] ; then
+ else
+ __rvm_gems_use
fi
}