scripts/utility in rvm-0.0.76 vs scripts/utility in rvm-0.0.77
- old
+ new
@@ -1,6 +1,6 @@
-#!/bin/bash
+#!/usr/bin/env bash
__rvm_info() {
full_version=$(ruby -v)
cat <<Info
@@ -591,22 +591,22 @@
if ! match "$rvm_ruby_args" "$prefix" ; then
rvm_ruby_args="$prefix $rvm_ruby_args"
fi
fi
rvm_command="$rvm_ruby_home/bin/$binary $rvm_ruby_require -I$load_path $rvm_ruby_args"
- elif [[ "gem" = "$binary" ]] && match "$rvm_ruby_args" 'install' ; then
+ elif [[ "gem" = "$binary" ]] && match "$rvm_ruby_args" '^install' ; then
rvm_command="$rvm_ruby_home/bin/$binary $rvm_ruby_args --no-rdoc --no-ri"
else
rvm_command="$rvm_ruby_home/bin/$binary $rvm_ruby_args"
fi
if [[ ! -z "$rvm_json_flag" ]] || [[ ! -z "$rvm_yaml_flag" ]] || [[ ! -z "$rvm_summary_flag" ]] ; then
mkdir -p ./log/$rvm_ruby_string/
touch ./log/$rvm_ruby_string/$rvm_action.log ./log/$rvm_ruby_string/$rvm_action.error.log
eval "$rvm_command" >> ./log/$rvm_ruby_string/$rvm_action.log 2>> ./log/$rvm_ruby_string/$rvm_action.error.log
else
- echo -e "\n\n\033[0;32m$rvm_ruby_string: $($rvm_ruby_home/bin/$binary -v | tr "\n" ' ')\033[0m\n"
+ echo -e "\n\n\033[0;32m$rvm_ruby_string: $($rvm_ruby_home/bin/ruby -v | tr "\n" ' ')\033[0m\n"
eval "$rvm_command"
fi
result=$?
if [[ $result -eq 0 ]]; then
eval "successes=(${successes[*]} $rvm_ruby_string)"
@@ -805,10 +805,25 @@
__rvm_run "$package/make" "/usr/bin/make $rvm_make_flags" "Compiling $package"
__rvm_run "$package/make.install" "/usr/bin/make install" "Installing $package to $rvm_path/usr"
__rvm_pushpop
}
+__rvm_curl_install() {
+ __rvm_make_flags
+ __rvm_pushpop $rvm_src_path
+ package="curl" ; version=7.19.7 ; archive_format="tar.gz"
+ __rvm_log "info" "Retrieving $package-$version.$archive_format"
+ __rvm_fetch "http://curl.haxx.se/download/$package-$version.$archive_format"
+ __rvm_run "$package/extract" "tar zxf $rvm_archives_path/$package-$version.$archive_format -C $rvm_src_path" "Extracting $package-$version.$archive_format"
+ cd "$rvm_src_path/$package-$version"
+ __rvm_run "$package/configure" "./configure --prefix=$rvm_path/usr" "Configuring $package."
+ __rvm_run "$package/make" "/usr/bin/make $rvm_make_flags" "Compiling $package"
+ __rvm_run "$package/make.install" "/usr/bin/make install" "Installing $package to $rvm_path/usr"
+ __rvm_pushpop
+}
+
+
__rvm_openssl_install() {
__rvm_make_flags
if match "$rvm_archflags" "x86_64" ; then
openssl_os="os/compiler darwin64-x86_64-cc"
else
@@ -950,18 +965,18 @@
eval "index=\$((\${#${array}[*]} + $__array_start))"
eval "${array}[${index}]=${item}"
}
match() {
- if [[ ! -z "$BASH_VERSION" ]] && [[ ${BASH_VERSION:0:1} -gt 2 ]] && [[ ${BASH_VERSION:2:1} -ge 1 ]] ; then
- [[ "$1" =~ $2 ]] ; return $?
+ #if [[ ! -z "$BASH_VERSION" ]] && [[ ${BASH_VERSION:0:1} -gt 2 ]] && [[ ${BASH_VERSION:2:1} -ge 1 ]] ; then
+ #[[ "$1" =~ $2 ]] ; return $?
# elif [[ ! -z "$ZSH_VERSION"]] && [[ ${ZSH_VERSION:0:1} -gt 3 ]] && [[ ${ZSH_VERSION:2:1} -ge 2 ]] && [[ ${ZSH_VERSION:4:1} -ge 4 ]] ; then
# return [[ "$1" =~ "$2" ]]
+ #else
+ if [ ! -z "$(echo "$1" | awk "/${2}/")" ] ; then
+ return 0
else
- if [ ! -z "$(echo "$1" | awk "/${2}/")" ] ; then
- return 0
- else
- return 1
- fi
+ return 1
fi
+ #fi
}