From e232fa58cf3ea168752814240e2a91077957f907 Mon Sep 17 00:00:00 2001 From: "Wayne E. Seguin" Date: Mon, 13 Sep 2010 19:45:26 -0400 Subject: [PATCH] Bugfix: prefix set in env no longer carries through to wrappers. --- scripts/utility | 10 +++------- scripts/wrapper | 2 +- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/scripts/utility b/scripts/utility index 4a4ba8dec6..e540ec27e3 100644 --- a/scripts/utility +++ b/scripts/utility @@ -375,19 +375,15 @@ __rvm_ensure_has_18_compat_ruby() { return 0 } -# Cleans up temp folders for a given prefix, +# Cleans up temp folders for a given prefix ($1), # typically the current process id. __rvm_cleanup_temp_for() { result=$? # Capture last command status - local prefix - - prefix="$1" - - [[ -z "$prefix" ]] && return 1 + [[ -z "${1:-""}" ]] && return 1 if [[ -d "${rvm_tmp_path:-"$rvm_path/tmp"}/" ]]; then - \rm -rf "${rvm_tmp_path:-"$rvm_path/tmp"}/$prefix"* >/dev/null 2>&1 + \rm -rf "${rvm_tmp_path:-"$rvm_path/tmp"}/$1"* >/dev/null 2>&1 fi return $result diff --git a/scripts/wrapper b/scripts/wrapper index b3d5770c79..6ca9373502 100755 --- a/scripts/wrapper +++ b/scripts/wrapper @@ -2,7 +2,7 @@ default_flag="$rvm_default_flag" # Prevent recursion -unset rvm_default_flag rvm_wrapper_name +unset rvm_default_flag rvm_wrapper_name prefix source "$rvm_path/scripts/base"