Skip to content

Commit

Permalink
Install adjustment.
Browse files Browse the repository at this point in the history
  • Loading branch information
wayneeseguin committed Sep 17, 2009
1 parent 0e880df commit acb6cbf
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 12 deletions.
2 changes: 1 addition & 1 deletion Rakefile
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ begin
gemspec.date = Time.now.strftime("%Y-%m-%d")
gemspec.description = "Manages Ruby interpreter installations and switching between them."
gemspec.platform = Gem::Platform::RUBY
gemspec.files = ["INSTALL", "README", "LICENCE", VERSION.yml, "rvm.gemspec", "bash/*", "scripts/*", "examples/*", "config/*", Dir::glob("lib/**/**")].flatten
gemspec.files = ["INSTALL", "README", "LICENCE", "rvm.gemspec", "bash/*", "scripts/*", "examples/*", "config/*", Dir::glob("lib/**/**")].flatten
gemspec.executables = Dir::glob("bin/rvm-*").map{ |script| File::basename script }
gemspec.require_path = "lib"
gemspec.has_rdoc = File::exist?("doc")
Expand Down
2 changes: 1 addition & 1 deletion scripts/rvm-cli
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ function __rvm_meta {
rvm_meta_author="Wayne E. Seguin"
rvm_meta_author_email="[email protected]"
rvm_meta_website="http://rvm.beginrescueend.com/"
rvm_meta_version="`cat $rvm_path/VERSION.yml | tail -n 3 | sed 's/^.*: //g' | tr "\n" '.' | sed 's/\.$//'`"
rvm_meta_version="`cat $rvm_path/lib/VERSION.yml | tail -n 3 | sed 's/^.*: //g' | tr "\n" '.' | sed 's/\.$//'`"
rvm_meta_updated="2009.09.17"
}

Expand Down
17 changes: 7 additions & 10 deletions scripts/rvm-install
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,16 @@ if [ ! -d "$source_dir" ] ; then unset source_dir ; fi
source_dir="${source_dir:-$cwd}"
rvm_dir=~/.rvm

echo -e "\nInstalling rvm source to ~/.rvm/scripts/rvm..."
echo -e "\nInstalling rvm to ~/.rvm/ ..."
for dir in src scripts bin log archives config gems examples ; do
mkdir -p $rvm_dir/$dir
done
for dir in config scripts examples ; do
mkdir -p $rvm_dir/$dir
/bin/cp -r $source_dir/$dir/ $rvm_dir/$dir
done
cp $source_dir/scripts/rvm-prompt $rvm_dir/bin/
chmod +x $rvm_dir/bin/rvm-prompt

# State what is required to use rvm
echo -e "\n\033[0;32mrvm\033[0m is a shell script that allows a user to manage multiple ruby versions in their own account."
Expand Down Expand Up @@ -116,15 +122,6 @@ if [ -f ~/.rvm/bin/rvm ] ; then
rm -f ~/.rvm/bin/rvm
fi

for dir in config scripts examples ; do
mkdir -p $rvm_dir/$dir
for file in `/bin/ls $source_dir/$dir/`; do
cp $source_dir/$dir/$file $rvm_dir/$dir/$file
done
done
cp $source_dir/scripts/rvm-prompt $rvm_dir/bin/
cp $source_dir/VERSION.yml $rvm_dir/

system=`uname`
if [ "$system" = "Linux" ] ; then
rvm_apt_get_binary=`which apt-get 2> /dev/null`
Expand Down

0 comments on commit acb6cbf

Please sign in to comment.