scripts/package in rvm-0.1.32 vs scripts/package in rvm-0.1.33
- old
+ new
@@ -20,12 +20,12 @@
__rvm_load_rvmrc
trap "rm -f $rvm_tmp_path/$$* > /dev/null 2>&1 ; exit" 0 1 2 3 15
if [[ ! -z "$rvm_trace_flag" ]] ; then set -x ; export rvm_trace_flag ; fi
-action="$(echo $* | awk '{print $1}')"
-library="$(echo $* | awk '{print $2}')"
+action="$(echo "$*" | awk '{print $1}')"
+library="$(echo "$*" | awk '{print $2}')"
args=$(echo "$*" | awk '{$1="" ; $2="" ; print}' | sed -e 's/^[[:space:]]*//' -e 's/[[:space:]]*$//')
install_package() {
if [[ ! -z "$rvm_make_flags_flag" ]] ; then __rvm_make_flags ; fi
@@ -42,11 +42,11 @@
__rvm_run "$package/extract" "tar jxf $rvm_archives_path/$package-$version.$archive_format -C $rvm_src_path" "Extracting $package-$version.$archive_format to $rvm_src_path"
elif [[ "$archive_format" = "zip" ]] ; then
$rvm_scripts_path/fetch "$package_url/$package-$version.$archive_format" || (result=$? && return $result)
__rvm_run "$package/extract" "unzip -q -o $rvm_archives_path/$package-$version.$archive_format -d $rvm_src_path/$package-$version" "Extracting $package-$version.$archive_format to $rvm_src_path"
else
- echo -e "Unrecognized archive format '$archive_format'" ; return 1
+ printf "\nUnrecognized archive format '$archive_format'" ; return 1
fi
builtin cd "$rvm_src_path/$package-$version"
__rvm_run "$package/configure" "${configure:-"./configure --prefix=${prefix_path:-"$rvm_usr_path"}"} $configure_flags" "Configuring $package in $rvm_src_path/$package-$version."
@@ -105,10 +105,10 @@
autoconf() {
package_url="ftp.gnu.org/gnu/autoconf"
package="autoconf" ; version="2.65" ; archive_format="tar.gz"
- prefix_path="${rvm_symlink_path:-"${rvm_path:-"$HOME/.rvm"}"}"
+ prefix_path="${rvm_bin_path:-"${rvm_path:-"$HOME/.rvm"}"}"
install_package
}
ncurses() {
package_url="http://ftp.gnu.org/pub/gnu/ncurses"