Skip to content

Commit

Permalink
Bugfix: s/gems/gemset/ in error messages.
Browse files Browse the repository at this point in the history
  • Loading branch information
wayneeseguin committed Mar 3, 2010
1 parent 91f3802 commit cad1bbd
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 9 deletions.
14 changes: 7 additions & 7 deletions scripts/gemsets
Expand Up @@ -25,7 +25,7 @@ __rvm_gemset_dir() {
__rvm_gemset_create() {
for gemset in $(echo $gems_args) ; do
gem_home="$rvm_ruby_gem_home%${gems_args/ /}"
mkdir -p $gem_home
mkdir -p $gem_home
ln -nfs "$HOME/.gem/cache" "$gem_home/cache"
$rvm_scripts_path/log "info" "Gemset '$gemset' created."
done ; unset gem_home
Expand Down Expand Up @@ -68,7 +68,7 @@ __rvm_gemset_delete() {
$rvm_scripts_path/log "info" "$gemdir already does not exist."
fi ; unset gemdir
else
$rvm_scripts_path/log "error" "A gems name must be specified in order to delete a gems."
$rvm_scripts_path/log "error" "A gemset name must be specified in order to delete a gems."
fi
}

Expand All @@ -78,7 +78,7 @@ __rvm_gemset_empty() {
if [[ -d "$gemdir" ]] && [[ "$gemdir" != '/' ]] && [[ ! -z "$rvm_force_flag" ]] ; then
cd $gemdir && rm -rf ./bin/* ./doc/* ./gems/* ./specifications/*
elif [[ -d "$gemdir" ]] ; then
$rvm_scripts_path/log "warn" "Are you SURE you wish to remove the installed gems for gemset '%$rvm_gemset_name' ($gemdir)?"
$rvm_scripts_path/log "warn" "Are you SURE you wish to remove the installed gemset for gemset '%$rvm_gemset_name' ($gemdir)?"
echo -n "(anything other than 'yes' will cancel) > "
read response
if [[ "yes" = "$response" ]] ; then
Expand All @@ -96,10 +96,10 @@ __rvm_gemset_copy() {
source_ruby="$(echo $gems_args | awk '{print $1}')"
destination_ruby="$(echo $gems_args | awk '{print $2}')"
if [[ -z "$source_ruby" ]] ; then
$rvm_scripts_path/log "error" "Source and destination must be specified: 'rvm gems copy X Y'"
$rvm_scripts_path/log "error" "Source and destination must be specified: 'rvm gemset copy X Y'"
fi
if [[ -z "$destination_ruby" ]] ; then
$rvm_scripts_path/log "error" "Source and destination must be specified: 'rvm gems copy X Y'"
$rvm_scripts_path/log "error" "Source and destination must be specified: 'rvm gemset copy X Y'"
fi
source_path="$($rvm_bin_path/rvm $source_ruby gem env gemdir | tail -n 1)"
destination_path="$($rvm_bin_path/rvm $destination_ruby gem env gemdir | tail -n 1)"
Expand Down Expand Up @@ -135,7 +135,7 @@ __rvm_gemset_export() {
fi
fi

$rvm_scripts_path/log "info" "Exporting current environments gems to $rvm_file_name"
$rvm_scripts_path/log "info" "Exporting current environments gemset to $rvm_file_name"

touch $rvm_file_name
echo "# $rvm_file_name generated gem export file. Note that any env variable settings will be missing. Append these after using a ';' field separator" > $rvm_file_name
Expand Down Expand Up @@ -345,7 +345,7 @@ elif [[ "clear" = "$action" ]] ; then
$rvm_scripts_path/log "info" "gemset cleared."
exit 0
else
$rvm_scripts_path/log "error" "Unrecognized gems action '$action'.\n\nValid gems actions are: {create,use,import,export,copy,delete,empty,name,list,gemdir,install}"
$rvm_scripts_path/log "error" "Unrecognized gemset action '$action'.\n\nValid gems actions are: {create,use,import,export,copy,delete,empty,name,list,gemdir,install}"
fi

exit $?
4 changes: 2 additions & 2 deletions scripts/utility
Expand Up @@ -656,7 +656,7 @@ __rvm_gemset_select() {

# If the gemset does not exist, then notify the user as such and abort the action.
if [[ ! -d "$rvm_ruby_gem_home" ]] && [[ ! -z "$rvm_gemset_name" ]] && [[ -z "$rvm_create_flag" ]]; then
$rvm_scripts_path/log "error" "Gemset '$rvm_gemset_name' does not exist, rvm gems create '$rvm_gemset_name' first."
$rvm_scripts_path/log "error" "Gemset '$rvm_gemset_name' does not exist, rvm gemset create '$rvm_gemset_name' first."
return 1
fi

Expand Down Expand Up @@ -706,7 +706,7 @@ __rvm_gemset_use() {

if [[ ! -z "$rvm_ruby_gem_home" ]] ; then
if [[ ! -d "$rvm_ruby_gem_home" ]] ; then
$rvm_scripts_path/log "error" "Gemset '$rvm_gemset_name' does not exist, rvm gems create '$rvm_gemset_name' first."
$rvm_scripts_path/log "error" "Gemset '$rvm_gemset_name' does not exist, rvm gemset create '$rvm_gemset_name' first."
return 1
fi

Expand Down

0 comments on commit cad1bbd

Please sign in to comment.