scripts/alias in rvm-0.1.39 vs scripts/alias in rvm-0.1.40
- old
+ new
@@ -1,18 +1,14 @@
#!/usr/bin/env bash
unset rvm_default_flag rvm_wrapper_name
-if [[ ! -z "$rvm_trace_flag" ]] ; then set -x ; export rvm_trace_flag ; fi
+source $rvm_scripts_path/base
-trap "if [[ -d $rvm_tmp_path/ ]] && [[ -f $rvm_tmp_path/$$ ]] ; then rm -f $rvm_tmp_path/$$ > /dev/null 2>&1 ; fi ; exit" 0 1 2 3 15
-
-source $rvm_scripts_path/initialize
-source $rvm_scripts_path/utility
-source $rvm_scripts_path/selector
-
alias_conflicts_with_ruby() {
+ # If default exists, we should return true.
+ [[ "$1" == "default" && ! -L "$rvm_rubies_path/default" ]] && return 1
# Open for suggestions to a better way of doing this...
alias_check_result="$(
. $rvm_scripts_path/initialize
. $rvm_scripts_path/selector
export rvm_ruby_string="$1"
@@ -91,10 +87,10 @@
alias_list() {
for item in $rvm_rubies_path/* ; do
if [[ -L "$item" ]] ; then
echo "$(basename $item) => $($rvm_scripts_path/db "$rvm_config_path/alias" "$(basename "$item")")"
fi
- done
+ done; unset item
}
action="$1"
alias_name="$2"
rvm_environment_identifier="$3"