Skip to content

Commit

Permalink
Feature: Removed path from system snapshot. Bugfix: test for file in …
Browse files Browse the repository at this point in the history
…post-install.
  • Loading branch information
wayneeseguin committed Sep 21, 2009
1 parent f51bb90 commit 8d7c65b
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 9 deletions.
7 changes: 3 additions & 4 deletions Rakefile
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,9 @@ puts <<-LOCAL_INSTALL_WARNING
\033[0;33mINSTALLING FROM SOURCE\033[0m
If you're using rvm from source, don't build the gem
Instead, run one of the following from the rvm source root
Instead, run the following from the rvm source root
\033[0;32mFor first-time install: ./scripts/rvm-install\033[0m
\033[0;32mFor updating your install: ./scripts/rvm-install\033[0m
\033[0;32mFor installing/updating: ./scripts/rvm-install\033[0m
LOCAL_INSTALL_WARNING

Expand All @@ -19,7 +18,7 @@ end
namespace :gem do
desc "Build the rvm gem."
task :build do
puts `gem build gemspec.rb`
puts `gem build rvm.gemspec`
end

desc "Install the rvm gem (NO sudo)."
Expand Down
2 changes: 1 addition & 1 deletion scripts/rvm-cli
Original file line number Diff line number Diff line change
Expand Up @@ -365,7 +365,7 @@ function rvm {
__rvm_cleanup_variables
__rvm_load-rvmrc
__rvm_initialize
__rvm_load-defaults
__rvm_load_defaults
__rvm_parse-args $@

if [ -z "$rvm_debug_flag" ] ; then set +x ; else set -x ; fi
Expand Down
4 changes: 2 additions & 2 deletions scripts/rvm-ruby-installer
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ function __rvm_install_source {
if [ -z "$rvm_ruby_make" ] ; then
__rvm_run "make" make $rvm_make_flags
else
__rvm_run "make" $rvm_ruby_make
__rvm_run "make" $rvm_ruby_make $rvm_make_flags
fi
if [ $? -gt 0 ] ; then result=$? ; return $result ; fi

Expand Down Expand Up @@ -413,7 +413,7 @@ function __rvm_post_install {

for binary in gem irb erb ri rdoc testrb rake ; do
if [ -f $rvm_ruby_home/bin/$binary -o -f $rvm_ruby_src_path/bin/$binary ] ; then
if [ "$rvm_ruby_src_path" != "$rvm_ruby_home" -a $rvm_ruby_src_path/bin/$binary] ; then
if [ "$rvm_ruby_src_path" != "$rvm_ruby_home" -a -f $rvm_ruby_src_path/bin/$binary] ; then
cp -f $rvm_ruby_src_path/bin/$binary $rvm_ruby_home/bin/$binary
elif [ -f "$rvm_gem_home/bin/$binary" ] ; then
cp -f $rvm_gem_home/bin/$binary $rvm_ruby_home/bin/$binary
Expand Down
4 changes: 2 additions & 2 deletions scripts/rvm-utility
Original file line number Diff line number Diff line change
Expand Up @@ -147,10 +147,10 @@ function __rvm_fetch {
return $result
}

function __rvm_load-defaults {
function __rvm_load_defaults {

if [ ! -s $rvm_path/system ] ; then
for variable in RUBY_VERSION GEM_HOME GEM_PATH MY_RUBY_HOME PATH ; do
for variable in RUBY_VERSION GEM_HOME GEM_PATH MY_RUBY_HOME ; do
eval value=\$${variable}
if [ -z "$value" ] ; then
echo "unset ${variable}" >> $rvm_path/system
Expand Down

0 comments on commit 8d7c65b

Please sign in to comment.