scripts/package in rvm-1.0.7 vs scripts/package in rvm-1.0.8
- old
+ new
@@ -10,53 +10,71 @@
action="${args[0]:-""}"
library="${args[1]:-""}"
args="$(echo ${args[@]:2})"
install_package() {
+ local result
__rvm_db "${package}_url" "package_url"
if [[ ! -z "$rvm_make_flags_flag" ]] ; then __rvm_make_flags ; fi
(
- builtin cd "$rvm_src_path"
+ builtin cd "${rvm_src_path:-"$rvm_path/src"}"
- "$rvm_path/scripts/log" "info" "Fetching $package-$version.$archive_format to $rvm_archives_path"
+ "$rvm_path/scripts/log" "info" "Fetching $package-$version.$archive_format to ${rvm_archives_path:-"$rvm_path/archives"}"
if [[ "$archive_format" = "tar.gz" ]] || [[ "$archive_format" = "tgz" ]] ; then
- "$rvm_path/scripts/fetch" "$package_url/$package-$version.$archive_format" || (result=$? && return $result)
- __rvm_run "$package/extract" "tar zxf $rvm_archives_path/$package-$version.$archive_format -C $rvm_src_path" "Extracting $package-$version.$archive_format to $rvm_src_path"
+ "$rvm_path/scripts/fetch" \
+ "$package_url/$package-$version.$archive_format" || (result=$? && return $result)
+ __rvm_run "$package/extract" \
+ "tar zxf ${rvm_archives_path:-"$rvm_path/archives"}/$package-$version.$archive_format -C ${rvm_src_path:-"$rvm_path/src"}" "Extracting $package-$version.$archive_format to ${rvm_src_path:-"$rvm_path/src"}"
+
elif [[ "$archive_format" = "tar.bz2" ]] ; then
- "$rvm_path/scripts/fetch" "$package_url/$package-$version.$archive_format" || (result=$? && return $result)
- __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"
+ "$rvm_path/scripts/fetch" \
+ "$package_url/$package-$version.$archive_format" || (result=$? && return $result)
+ __rvm_run "$package/extract" \
+ "tar jxf ${rvm_archives_path:-"$rvm_path/archives"}/$package-$version.$archive_format -C ${rvm_src_path:-"$rvm_path/src"}" "Extracting $package-$version.$archive_format to ${rvm_src_path:-"$rvm_path/src"}"
+
elif [[ "$archive_format" = "zip" ]] ; then
- "$rvm_path/scripts/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"
+ "$rvm_path/scripts/fetch" \
+ "$package_url/$package-$version.$archive_format" || (result=$? && return $result)
+ __rvm_run "$package/extract" \
+ "unzip -q -o ${rvm_archives_path:-"$rvm_path/archives"}/$package-$version.$archive_format -d ${rvm_src_path:-"$rvm_path/src"}/$package-$version" "Extracting $package-$version.$archive_format to ${rvm_src_path:-"$rvm_path/src"}"
+
else
printf "\nUnrecognized archive format '$archive_format'" ; return 1
fi
- builtin cd "$rvm_src_path/$package-$version"
+ builtin cd "${rvm_src_path:-"$rvm_path/src"}/$package-$version"
- __rvm_run "$package/configure" "${configure:-"./configure --prefix=${prefix_path:-"$rvm_usr_path"}"} $configure_flags" "Configuring $package in $rvm_src_path/$package-$version."
+ __rvm_run "$package/configure" \
+ "${configure:-"./configure --prefix=${prefix_path:-"${rvm_usr_path:-"$rvm_path/usr"}"}"} $configure_flags" "Configuring $package in ${rvm_src_path:-"$rvm_path/src"}/$package-$version."
unset configure_flags
if [[ "$action" = "uninstall" ]] ; then
- __rvm_run "$package/make.uninstall" "/usr/bin/make uninstall" "Uninstalling $package from $rvm_usr_path"
+ __rvm_run "$package/make.uninstall" \
+ "/usr/bin/make uninstall" "Uninstalling $package from ${rvm_usr_path:-"$rvm_path/usr"}"
else
- __rvm_run "$package/make" "/usr/bin/make $rvm_make_flags" "Compiling $package in $rvm_src_path/$package-$version."
- __rvm_run "$package/make.install" "/usr/bin/make install" "Installing $package to $rvm_usr_path"
+ __rvm_run "$package/make" \
+ "/usr/bin/make $rvm_make_flags" "Compiling $package in ${rvm_src_path:-"$rvm_path/src"}/$package-$version."
+
+ __rvm_run "$package/make.install" \
+ "/usr/bin/make install" "Installing $package to ${rvm_usr_path:-"$rvm_path/usr"}"
fi
- \touch "$rvm_config_path/packages"
- "$rvm_path/scripts/db" "$rvm_config_path/packages" "${package}" "${version}"
+ touch "$rvm_path/config/packages"
+ "$rvm_path/scripts/db" "$rvm_path/config/packages" "${package}" "${version}"
)
+ result=$?
+
+ return $result
}
readline() {
package="readline" ; archive_format="tar.gz"
for version in 5.2 6.0 ; do
@@ -117,22 +135,22 @@
rvm_make_flags=$(echo "$rvm_make_flags" | sed -e "s/-j[[:space:]]*[[0-9]]*//")
fi
else
configure_command="./config"
fi
- configure="$configure_command $openssl_os -I$rvm_usr_path/include -L$rvm_usr_path/lib --prefix=$rvm_usr_path zlib no-asm no-krb5 shared"
+ configure="$configure_command $openssl_os -I${rvm_usr_path:-"$rvm_path/usr"}/include -L${rvm_usr_path:-"$rvm_path/usr"}/lib --prefix=${rvm_usr_path:-"$rvm_path/usr"} zlib no-asm no-krb5 shared"
install_package
}
zlib() {
package="zlib" ; version="1.2.5" ; archive_format="tar.gz"
install_package
}
autoconf() {
package="autoconf" ; version="2.65" ; archive_format="tar.gz"
- prefix_path="${rvm_bin_path:-"${rvm_path:-"$HOME/.rvm"}"}"
+ prefix_path="${rvm_usr_path:-"$rvm_path/usr"}"
install_package
}
ncurses() {
package="ncurses" ; version="5.7" ; archive_format="tar.gz"
@@ -151,21 +169,21 @@
}
libxml2() {
package="libxml2" ; version="2.7.3" ; archive_format="tar.gz"
if [[ "Darwin" = "$(uname)" ]] ; then
- configure="./configure --prefix=${rvm_usr_path} --build=i686-apple-darwin$(uname -r) --host=i686-apple-darwin$(uname -r)"
+ configure="./configure --prefix=${rvm_usr_path:-"$rvm_path/usr"} --build=i686-apple-darwin$(uname -r) --host=i686-apple-darwin$(uname -r)"
fi
install_package
unset prefix_path
}
glib() {
pkgconfig
gettext
package="glib" ; version="2.23.1" ; archive_format="tar.gz"
- configure="CC=\"cc -L$rvm_usr_path/lib -I$rvm_usr_path/include\" PKG_CONFIG=\"$rvm_usr_path/bin/pkg-config\" ./configure --prefix=$rvm_usr_path"
+ configure="CC=\"cc -L${rvm_usr_path:-"$rvm_path/usr"}/lib -I${rvm_usr_path:-"$rvm_path/usr"}/include\" PKG_CONFIG=\"${rvm_usr_path:-"$rvm_path/usr"}/bin/pkg-config\" ./configure --prefix=${rvm_usr_path:-"$rvm_path/usr"}"
install_package
}
mono() {
@@ -178,15 +196,15 @@
llvm() {
package="llvm" ; version="89156"
if [[ ! -z "$rvm_make_flags_flag" ]] ; then __rvm_make_flags ; fi
(
- builtin cd $rvm_src_path
- if [[ ! -d "$rvm_src_path/llvm/.svn" ]] ; then
+ builtin cd ${rvm_src_path:-"$rvm_path/src"}
+ if [[ ! -d "${rvm_src_path:-"$rvm_path/src"}/llvm/.svn" ]] ; then
__rvm_db "${package}_url" "package_url"
- \rm -rf "$rvm_src_path/llvm"
+ \rm -rf "${rvm_src_path:-"$rvm_path/src"}/llvm"
svn co -r "$version" "$package_url" llvm
- builtin cd "$rvm_src_path/llvm"
+ builtin cd "${rvm_src_path:-"$rvm_path/src"}/llvm"
./configure --enable-bindings=none
UNIVERSAL=1 UNIVERSAL_ARCH="i386 x86_64" ENABLE_OPTIMIZED=1 make -j2
sudo env UNIVERSAL=1 UNIVERSAL_ARCH="i386 x86_64" ENABLE_OPTIMIZED=1 make install
fi
)