scripts/alias in rvm-1.0.2 vs scripts/alias in rvm-1.0.3

- old
+ new

@@ -45,20 +45,25 @@ } delete_alias() { echo "Deleting alias: $alias_name" for link in "$rvm_rubies_path/$alias_name" ; do - if [[ -L "$link" ]] ; then \rm -f $link ; fi + if [[ -L "$link" ]] ; then rm -f $link ; fi done "$rvm_scripts_path"/db "$rvm_config_path/alias" "$alias_name" "delete" } create_alias() { + rvm_environment_identifier="${rvm_environment_identifier:-""}" + alias_name="${alias_name:-""}" + rvm_ruby_string="${rvm_ruby_string:-""}" + if alias_conflicts_with_ruby "$alias_name"; then # Force it to an empty alias name to trigger the usage. alias_name="" fi + if [[ -z "$rvm_environment_identifier" ]] || [[ -z "$alias_name" ]] ; then "$rvm_scripts_path"/log "error" "usage: 'rvm alias [alias_name] [ruby_string]'" result=1 else if [[ -z "$rvm_alias" ]] ; then @@ -98,14 +103,17 @@ echo "$(basename "$item") => $("$rvm_scripts_path"/db "$rvm_config_path/alias" "$(basename "$item")")" fi done; unset item } -action="$1" -alias_name="$2" -rvm_environment_identifier="$3" -if [[ ! -f "$rvm_config_path/alias" ]] ; then \touch "$rvm_config_path/alias" ; fi -if printf "$alias_name" | \grep -q "$rvm_gemset_separator" ; then +args=($*) +action="${args[0]}" +alias_name="${args[1]}" +rvm_environment_identifier="${args[2]}" +args="$(echo ${args[@]:3}) " # Strip trailing / leading / extra spacing. + +if [[ ! -f "$rvm_config_path/alias" ]] ; then touch "$rvm_config_path/alias" ; fi +if printf "$alias_name" | grep -q "$rvm_gemset_separator" ; then gemset_name="${alias_name/*${rvm_gemset_separator}/}" alias_name="${alias_name/${rvm_gemset_separator}*/}" fi if [[ ! -z "$alias_name" ]] ; then rvm_alias="$("$rvm_scripts_path"/db "$rvm_config_path/alias" "$alias_name")"