Skip to content

Commit

Permalink
Empty check.
Browse files Browse the repository at this point in the history
  • Loading branch information
wayneeseguin committed Mar 25, 2011
1 parent 81a4c50 commit 6132666
Showing 1 changed file with 11 additions and 24 deletions.
35 changes: 11 additions & 24 deletions scripts/functions/installer
Original file line number Diff line number Diff line change
Expand Up @@ -482,61 +482,48 @@ install_patchsets()
cleanse_old_environments()
{
if [[ -d "$rvm_path/environments" ]] ; then
#
# Remove BUNDLE_PATH from environment files
#
environments=($( find "$rvm_path/environments" -maxdepth 1 -mindepth 1 -type f ))
for file in "${environments[@]}" ; do
if grep 'BUNDLE_PATH' "$file" > /dev/null ; then
grep -v 'BUNDLE_PATH' "$file" > "$file.new"
mv "$file.new" "$file"
fi
done
environments=(
$(find "$rvm_path/environments/" -maxdepth 1 -mindepth 1 -type f)
)
if [[ ${#environments[@]} -gt 0 ]] ; then
for file in "${environments[@]}" ; do
if grep 'BUNDLE_PATH' "$file" > /dev/null 2>&1; then
grep -v 'BUNDLE_PATH' "$file" > "$file.new"
mv "$file.new" "$file"
fi
done
fi
fi
}

migrate_old_gemsets()
{
for gemset in "$rvm_path"/gems/*\%* ; do

new_path=${gemset/\%/${rvm_gemset_separator:-"@"}}

if [[ -d "$gemset" ]] && [[ ! -d "$new_path" ]] ; then

printf "\n Renaming $(basename "$gemset") to $(basename "$new_path") for new gemset separator."

mv "$gemset" "$new_path"

fi

done

for gemset in "$rvm_path"/gems/*\+* ; do

new_path=${gemset/\+/${rvm_gemset_separator:-"@"}}

if [[ -d "$gemset" && ! -d "$new_path" ]] ; then

printf "\n Renaming $(basename "$gemset") to $(basename "$new_path") for new gemset separator."

mv $gemset $new_path

fi

done

for gemset in "$rvm_path"/gems/*\@ ; do

new_path=$(echo $gemset | sed -e 's#\@$##')

if [[ -d "$gemset" && ! -d "$new_path" ]] ; then

printf "\n Fixing: $(basename "$gemset") to $(basename "$new_path") for new gemset separator."

mv "$gemset" "$new_path"

fi

done
}

Expand Down

0 comments on commit 6132666

Please sign in to comment.