scripts/docs in rvm-1.0.4 vs scripts/docs in rvm-1.0.5

- old
+ new

@@ -34,27 +34,29 @@ fi } generate_ri() { # Generate ri docs - __rvm_pushpop "$rvm_src_path/$rvm_docs_ruby_string/" - "$rvm_scripts_path"/log "info" "Generating ri documentation, be aware that this could take a *long* time, and depends heavily on your system resources..." - "$rvm_scripts_path"/log "info" "( Errors will be logged to $rvm_log_path/$rvm_docs_ruby_string/docs.error.log )" - rdoc -a --ri --ri-site > /dev/null 2>> $rvm_log_path/$rvm_docs_ruby_string/docs.error.log - __rvm_pushpop + ( + builtin cd "$rvm_src_path/$rvm_docs_ruby_string/" + "$rvm_scripts_path"/log "info" "Generating ri documentation, be aware that this could take a *long* time, and depends heavily on your system resources..." + "$rvm_scripts_path"/log "info" "( Errors will be logged to $rvm_log_path/$rvm_docs_ruby_string/docs.error.log )" + rdoc -a --ri --ri-site > /dev/null 2>> $rvm_log_path/$rvm_docs_ruby_string/docs.error.log + ) } generate_rdoc() { - __rvm_pushpop "$rvm_src_path/$rvm_docs_ruby_string/" - \rm -rf "$rvm_docs_path/$rvm_docs_ruby_string/$rvm_docs_type/" - "$rvm_scripts_path"/log "info" "Generating rdoc documentation, be aware that this could take a *long* time, and depends heavily on your system resources..." - "$rvm_scripts_path"/log "info" "( Errors will be logged to $rvm_log_path/$rvm_docs_ruby_string/docs.error.log )" - if gem list | \grep -q ^hanna ; then - hanna -o "$rvm_docs_path/$rvm_docs_ruby_string/$rvm_docs_type" --inline-source --line-numbers --fmt=html > /dev/null 2>> "$rvm_log_path/$rvm_docs_ruby_string/docs.error.log" - else - rdoc -a -o "$rvm_docs_path/$rvm_docs_ruby_string/$rvm_docs_type" > /dev/null 2>> "$rvm_log_path/$rvm_docs_ruby_string/docs.error.log" - fi - __rvm_pushpop + ( + builtin cd "$rvm_src_path/$rvm_docs_ruby_string/" + \rm -rf "$rvm_docs_path/$rvm_docs_ruby_string/$rvm_docs_type/" + "$rvm_scripts_path"/log "info" "Generating rdoc documentation, be aware that this could take a *long* time, and depends heavily on your system resources..." + "$rvm_scripts_path"/log "info" "( Errors will be logged to $rvm_log_path/$rvm_docs_ruby_string/docs.error.log )" + if gem list | \grep -q ^hanna ; then + hanna -o "$rvm_docs_path/$rvm_docs_ruby_string/$rvm_docs_type" --inline-source --line-numbers --fmt=html > /dev/null 2>> "$rvm_log_path/$rvm_docs_ruby_string/docs.error.log" + else + rdoc -a -o "$rvm_docs_path/$rvm_docs_ruby_string/$rvm_docs_type" > /dev/null 2>> "$rvm_log_path/$rvm_docs_ruby_string/docs.error.log" + fi + ) } args=($*) action="${args[0]}" args="$(echo ${args[@]:1}) " # Strip trailing / leading / extra spacing.