scripts/gemsets in rvm-0.1.33 vs scripts/gemsets in rvm-0.1.34
- old
+ new
@@ -21,11 +21,10 @@
__rvm_gemset_create() {
rvm_ruby_gem_prefix=$(echo $rvm_ruby_gem_home | sed 's/'${rvm_gemset_separator}'.*$//')
for gemset in $(echo $gems_args) ; do
gem_home="${rvm_ruby_gem_prefix}${rvm_gemset_separator}${gems_args/ /}"
mkdir -p $gem_home
- ln -nfs "$HOME/.gem/cache" "$gem_home/cache"
$rvm_scripts_path/log "info" "Gemset '$gemset' created."
done ; unset gem_home
}
__rvm_gemset_list() {
@@ -53,11 +52,12 @@
elif [[ -d "$gemdir" ]] ; then
$rvm_scripts_path/log "warn" "Are you SURE you wish to remove the entire gemset directory '$rvm_gemset_name' ($gemdir)?"
echo -n "(anything other than 'yes' will cancel) > "
read response
if [[ "yes" = "$response" ]] ; then
- rm -f $gemdir/cache && rm -rf $gemdir
+ rm -f $gemdir/cache 2>/dev/null
+ rm -rf $gemdir
else
$rvm_scripts_path/log "info" "Not doing anything, phew... close call that one eh?"
fi
else
$rvm_scripts_path/log "info" "$gemdir already does not exist."
@@ -235,14 +235,14 @@
unset gem
$rvm_scripts_path/log "info" "$gem_name $gem_version exists, skipping (--force to re-install)"
else
if [[ -s "$gem" ]] ; then
cache_file="$gem"
- elif [[ -s "$rvm_gems_path/cache/${gem_file_name}" ]] ; then
- cache_file="$rvm_gems_path/cache/${gem_file_name}"
+ elif [[ -s "$rvm_ruby_gem_home/cache/${gem_file_name}" ]] ; then
+ cache_file="$rvm_ruby_gem_home/cache/${gem_file_name}"
else
- cache_file="${cache_file:-$(\ls ${rvm_gems_path}/cache/${gem_file_name} 2> /dev/null | sort | head -n1)}"
+ cache_file="${cache_file:-$(\ls ${rvm_ruby_gem_home}/cache/${gem_file_name} 2> /dev/null | sort | head -n1)}"
fi
if [[ ! -s "$cache_file" ]] ; then
if [[ -s "$gem_file_name" ]] ; then
gem="$gem_file_name"
@@ -257,12 +257,12 @@
if [[ -z "$rvm_force_flag" ]] && [[ -s "${rvm_ruby_gem_home}/specifications/$(basename $gem_file_name)spec" ]] ; then
unset gem # already installed, not forcing reinstall.
$rvm_scripts_path/log "info" "$gem_name $gem_version exists, skipping (--force to re-install)"
else
- if [[ -s "$rvm_gems_path/cache/$(basename $gem_file_name)" ]] ; then
+ if [[ -s "$rvm_ruby_gem_home/cache/$(basename $gem_file_name)" ]] ; then
mkdir -p "$rvm_tmp_path/$$/"
- mv "$rvm_gems_path/cache/$gem_file_name" "$rvm_tmp_path/$$/$gem_file_name"
+ mv "$rvm_ruby_gem_home/cache/$gem_file_name" "$rvm_tmp_path/$$/$gem_file_name"
gem="$rvm_tmp_path/$$/$gem_file_name -f -l"
else
gem="$cache_file"
fi
fi