scripts/rvm-install in rvm-0.0.82 vs scripts/rvm-install in rvm-0.0.83

- old
+ new

@@ -36,11 +36,13 @@ # Scripts # rm -rf $rvm_path/scripts # Clear the old scripts directory so that the old style rvm- scripts are cleared out. for dir_name in config scripts examples lib hooks ; do mkdir -p "$rvm_path/$dir_name" - cp -Rf "$source_dir/$dir_name" "$rvm_path" + if [[ -d "$source_dir/$dir_name" ]] ; then + cp -Rf "$source_dir/$dir_name" "$rvm_path" + fi done ; unset dir_name # # Bin Scripts # @@ -71,46 +73,10 @@ chmod +x $rvm_path/scripts/rvm # # System Checks # -system="$(uname)" -echo -e "\n$(tput setaf 2)Notes: $(tput sgr0)\n" -if [[ "Linux" = "$system" ]] ; then - rvm_apt_get_binary="$(which aptitude 2> /dev/null)" - rvm_emerge_binary="$(which emerge 2> /dev/null)" - rvm_pacman_binary="$(which pacman 2> /dev/null)" - rvm_yum_binary="$(which yum 2> /dev/null)" - - if [[ ! -z "$rvm_apt_get_binary" ]] ; then - echo -e " $item For JRuby (if you wish to use it) you will need:" - echo -e " $ aptitude install sun-java6-bin sun-java6-jre sun-java6-jdk" - echo -e " $item For ree (if you wish to use it) you will need:" - echo -e " $ aptitude install libreadline5-dev libssl-dev bison" - echo -e " $item For 1.9.X (if you wish to use it) we additionally recommend:" - echo -e " $ aptitude install libxml2-dev" - - elif [[ ! -z "$rvm_emerge_binary" ]] ; then - echo -e " $item For JRuby (if you wish to use it) you will need:" - echo -e " $ emerge dev-java/sun-jdk dev-java/sun-jre-bin" - - elif [[ ! -z "$rvm_pacman_binary" ]] ; then - echo -e " $item For JRuby (if you wish to use it) you will need:" - echo -e " $ pacman -Sy jdk jre" - - elif [[ ! -z "$rvm_yum_binary" ]] ; then - echo -e " $item For ree (if you wish to use it) you will need:" - echo -e " $ yum install -y rpm-build gcc gcc-c++ redhat-rpm-config ; then download and rpmbuild and install the sdk, Have fun..." - - else - echo -e " $item For JRuby (if you wish to use it) you will need:" - echo -e " The SUN java runtime environment and development kit." - fi -elif [[ "Darwin" = "$system" ]] ; then - echo -e " $item Be sure that you have XCode Tools (Version 3.2.1 (1613) or later) installed in order to use rvm." - echo -e " $item You can download the latest XCode tools from developer.apple.com. This will be necessary with the dvd install for Snow Leopard which has bugs." - echo -e " $item If you intend on installing MacRuby you must install LLVM first." -fi +$rvm_path/scripts/notes echo -e " $item In order to use rvm the following line must occur in your shell's loading files, after all path/variable settings.:" echo -e " $item if [[ -s $rvm_path/scripts/rvm ]] ; then source $rvm_path/scripts/rvm ; fi" echo -e " $item CLOSE THIS SHELL AND OPEN A NEW ONE in order to use rvm."