diff --git a/scripts/disk-usage b/scripts/disk-usage index 5256c27aef..cf35682eef 100755 --- a/scripts/disk-usage +++ b/scripts/disk-usage @@ -56,7 +56,7 @@ others_disk_usage() fi for filter in archives repos src log usr rubies gems wrappers tmp - do flags+=( "${flag}${filter}" ) + do flags+=( ${flag}${filter} ) done disk_usage "Other Files" "." "${flags[@]}" diff --git a/scripts/get b/scripts/get index e35a0b389b..fb546896a9 100755 --- a/scripts/get +++ b/scripts/get @@ -177,8 +177,16 @@ get_head() if ! git branch | grep " ${_local_branch}$" >/dev/null && ! git branch --track --force ${_local_branch} remotes/${_name}/${_branch} then - rvm_error "Could not create local branch ${_local_branch}." - return 5 + if [[ "${_local_branch}" == "master" ]] + then + rvm_error "Could not create local branch ${_local_branch}, cleaning sources, please try again." + builtin cd "${rvm_src_path}" + __rvm_rm_rf "${rvm_src_path}/rvm" + return 5 + else + rvm_error "Could not create local branch ${_local_branch}." + return 5 + fi fi if ! git branch | grep "\* ${_local_branch}$" >/dev/null &&