scripts/libraries in rvm-0.0.97 vs scripts/libraries in rvm-0.0.98
- old
+ new
@@ -2,11 +2,11 @@
#
# ruby supporting libraries:
#
__rvm_readline_install() {
- (( $rvm_make_flags_flag )) && __rvm_make_flags
+ if [[ ! -z "$rvm_make_flags_flag" ]] ; then __rvm_make_flags ; fi
__rvm_pushpop $rvm_src_path
package="readline" ; version="5.2" ; archive_format="tar.gz"
# TODO: Figure out how to list, grab and apply the patches
#ftp://ftp.cwru.edu/pub/bash/readline-6.0.tar.gz
for version in 5.2 6.0 ; do
@@ -33,11 +33,11 @@
done
__rvm_pushpop
}
__rvm_iconv_install() {
- (( $rvm_make_flags_flag )) && __rvm_make_flags
+ if [[ ! -z "$rvm_make_flags_flag" ]] ; then __rvm_make_flags ; fi
__rvm_pushpop $rvm_src_path
__rvm_pushpop $rvm_src_path
package="libiconv" ; version=1.13.1 ; archive_format="tar.gz"
$rvm_scripts_path/log "info" "Retrieving $package-$version.$archive_format"
$rvm_scripts_path/fetch "http://ftp.gnu.org/pub/gnu/libiconv/$package-$version.$archive_format" || (result=$? && return $result)
@@ -52,11 +52,11 @@
fi
__rvm_pushpop
}
__rvm_curl_install() {
- (( $rvm_make_flags_flag )) && __rvm_make_flags
+ if [[ ! -z "$rvm_make_flags_flag" ]] ; then __rvm_make_flags ; fi
__rvm_pushpop $rvm_src_path
package="curl" ; version=7.19.7 ; archive_format="tar.gz"
$rvm_scripts_path/log "info" "Retrieving $package-$version.$archive_format"
$rvm_scripts_path/fetch "http://curl.haxx.se/download/$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"
@@ -70,11 +70,11 @@
fi
__rvm_pushpop
}
__rvm_openssl_install() {
- (( $rvm_make_flags_flag )) && __rvm_make_flags
+ if [[ ! -z "$rvm_make_flags_flag" ]] ; then __rvm_make_flags ; fi
if $rvm_scripts_path/match "$rvm_archflags" "x86_64" ; then
openssl_os="os/compiler darwin64-x86_64-cc"
else
openssl_os="os/compiler darwin-i386-cc"
fi
@@ -93,11 +93,11 @@
fi
__rvm_pushpop
}
__rvm_zlib_install() {
- (( $rvm_make_flags_flag )) && __rvm_make_flags
+ if [[ ! -z "$rvm_make_flags_flag" ]] ; then __rvm_make_flags ; fi
__rvm_pushpop $rvm_src_path
package="zlib" ; version="1.2.3" ; archive_format="tar.gz"
$rvm_scripts_path/log "info" "Retrieving $package-$version.$archive_format"
$rvm_scripts_path/fetch "http://www.zlib.net/$package-$version.tar.gz" || (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"
@@ -111,11 +111,11 @@
fi
__rvm_pushpop
}
__rvm_ncurses_install() {
- (( $rvm_make_flags_flag )) && __rvm_make_flags
+ if [[ ! -z "$rvm_make_flags_flag" ]] ; then __rvm_make_flags ; fi
__rvm_pushpop $rvm_src_path
package="ncurses" ; version="5.7" ; archive_format="tar.gz"
$rvm_scripts_path/log "info" "Retrieving $package"
$rvm_scripts_path/fetch "ftp://invisible-island.net/ncurses/ncurses.tar.gz" || (result=$? && return $result)
__rvm_run "$package/extract" "tar zxf $rvm_archives_path/$package.$archive_format -C $rvm_src_path" "Extracting $package.$archive_format"
@@ -129,10 +129,10 @@
fi
__rvm_pushpop
}
__rvm_install_llvm() {
- (( $rvm_make_flags_flag )) && __rvm_make_flags
+ if [[ ! -z "$rvm_make_flags_flag" ]] ; then __rvm_make_flags ; fi
builtin cd "$rvm_src_path"
if [[ ! -d "$rvm_src_path/llvm/.svn" ]] ; then
rm -rf "$rvm_src_path/llvm"
svn co -r 82747 https://llvm.org/svn/llvm-project/llvm/trunk llvm
builtin cd "$rvm_src_path/llvm"