scripts/libraries in rvm-0.0.89 vs scripts/libraries in rvm-0.0.90

@@ -23,16 +23,17 @@
       __rvm_run "$package/configure" "./configure --prefix=$rvm_path/usr --disable-dependency-tracking --disable-static --enable-shared" "Configuring $package"
     else
       __rvm_run "$package/configure" "./configure --prefix=$rvm_path/usr --disable-dependency-tracking --disable-static --enable-shared" "Configuring $package"
     fi
 
-    if [[ "$rvm_install_flag" -eq 1 ]] ; then
+    if [[ "$rvm_uninstall_flag" -eq 1 ]] || [[ "$rvm_remove_flag" -eq 1 ]] ; then
+      __rvm_run "$package/make.uninstall" "/usr/bin/make uninstall" "uninstalling $package from $rvm_path/usr"
+    else
       __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"
-    elif [[ "$rvm_uninstall_flag" -eq 1 ]] || [[ "$rvm_remove_flag" -eq 1 ]] ; then
-      __rvm_run "$package/make.uninstall" "/usr/bin/make uninstall" "uninstalling $package from $rvm_path/usr"
     fi
+
   done
   __rvm_pushpop
 }
 
 __rvm_iconv_install() {
@@ -43,16 +44,17 @@
   $rvm_scripts_path/fetch "http://ftp.gnu.org/pub/gnu/libiconv/$package-$version.$archive_format"
   result=$? ; if [[ "$result" -gt 0 ]] ; then return $result ; fi
   __rvm_run "$package/extract" "tar zxf $rvm_archives_path/$package-$version.$archive_format -C $rvm_src_path" "Extracting $package-$version.$archive_format"
   builtin cd "$rvm_src_path/$package-$version"
   __rvm_run "$package/configure" "./configure --prefix=$rvm_path/usr" "Configuring $package."
-  if [[ "$rvm_install_flag" -eq 1 ]] ; then
+  if [[ "$rvm_uninstall_flag" -eq 1 ]] || [[ "$rvm_remove_flag" -eq 1 ]] ; then
+    __rvm_run "$package/make.uninstall" "/usr/bin/make uninstall" "uninstalling $package from $rvm_path/usr"
+  else
     __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"
-  elif [[ "$rvm_uninstall_flag" -eq 1 ]] || [[ "$rvm_remove_flag" -eq 1 ]] ; then
-    __rvm_run "$package/make.uninstall" "/usr/bin/make uninstall" "uninstalling $package from $rvm_path/usr"
   fi
+
   __rvm_pushpop
 }
 
 __rvm_curl_install() {
   if [[ "rvm_make_flags_flag" -eq 1 ]] ; then __rvm_make_flags ; fi
@@ -62,16 +64,17 @@
   $rvm_scripts_path/fetch "http://curl.haxx.se/download/$package-$version.$archive_format"
   result=$? ; if [[ "$result" -gt 0 ]] ; then return $result ; fi
   __rvm_run "$package/extract" "tar zxf $rvm_archives_path/$package-$version.$archive_format -C $rvm_src_path" "Extracting $package-$version.$archive_format"
   builtin cd "$rvm_src_path/$package-$version"
   __rvm_run "$package/configure" "./configure --prefix=$rvm_path/usr" "Configuring $package."
-  if [[ "$rvm_install_flag" -eq 1 ]] ; then
+  if [[ "$rvm_uninstall_flag" -eq 1 ]] || [[ "$rvm_remove_flag" -eq 1 ]] ; then
+    __rvm_run "$package/make.uninstall" "/usr/bin/make uninstall" "uninstalling $package from $rvm_path/usr"
+  else
     __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"
-  elif [[ "$rvm_uninstall_flag" -eq 1 ]] || [[ "$rvm_remove_flag" -eq 1 ]] ; then
-    __rvm_run "$package/make.uninstall" "/usr/bin/make uninstall" "uninstalling $package from $rvm_path/usr"
   fi
+
   __rvm_pushpop
 }
 
 __rvm_openssl_install() {
   if [[ "rvm_make_flags_flag" -eq 1 ]] ; then __rvm_make_flags ; fi
@@ -86,16 +89,17 @@
   $rvm_scripts_path/fetch "http://www.openssl.org/source/$package-$version.tar.gz"
   result=$? ; if [[ "$result" -gt 0 ]] ; then return $result ; fi
   __rvm_run "$package/extract" "tar zxf $rvm_archives_path/$package-$version.$archive_format -C $rvm_src_path" "Extracting $package-$version.$archive_format"
   builtin cd "$rvm_src_path/$package-$version"
   __rvm_run "$package/config" "./config --prefix=$rvm_path/usr zlib no-asm no-krb5 shared" "Configuring $package."
-  if [[ "$rvm_install_flag" -eq 1 ]] ; then
+  if [[ "$rvm_uninstall_flag" -eq 1 ]] || [[ "$rvm_remove_flag" -eq 1 ]] ; then
+    __rvm_run "$package/make.uninstall" "/usr/bin/make uninstall" "uninstalling $package from $rvm_path/usr"
+  else
     __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"
-  elif [[ "$rvm_uninstall_flag" -eq 1 ]] || [[ "$rvm_remove_flag" -eq 1 ]] ; then
-    __rvm_run "$package/make.uninstall" "/usr/bin/make uninstall" "uninstalling $package from $rvm_path/usr"
   fi
+
   __rvm_pushpop
 }
 
 __rvm_zlib_install() {
   if [[ "rvm_make_flags_flag" -eq 1 ]] ; then __rvm_make_flags ; fi
@@ -105,16 +109,17 @@
   $rvm_scripts_path/fetch "http://www.zlib.net/$package-$version.tar.gz"
   result=$? ; if [[ "$result" -gt 0 ]] ; then return $result ; fi
   __rvm_run "$package/extract" "tar zxf $rvm_archives_path/$package-$version.$archive_format -C $rvm_src_path" "Extracting $package-$version.$archive_format"
   builtin cd "$rvm_src_path/$package-$version"
   __rvm_run "$package/configure" "./configure --prefix=$rvm_path/usr" "Configuring $package."
-  if [[ "$rvm_install_flag" -eq 1 ]] ; then
+  if [[ "$rvm_uninstall_flag" -eq 1 ]] || [[ "$rvm_remove_flag" -eq 1 ]] ; then
+    __rvm_run "$package/make.uninstall" "/usr/bin/make uninstall" "uninstalling $package from $rvm_path/usr"
+  else
     __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"
-  elif [[ "$rvm_uninstall_flag" -eq 1 ]] || [[ "$rvm_remove_flag" -eq 1 ]] ; then
-    __rvm_run "$package/make.uninstall" "/usr/bin/make uninstall" "uninstalling $package from $rvm_path/usr"
   fi
+
   __rvm_pushpop
 }
 
 __rvm_ncurses_install() {
   if [[ "rvm_make_flags_flag" -eq 1 ]] ; then __rvm_make_flags ; fi
@@ -124,14 +129,14 @@
   $rvm_scripts_path/fetch "ftp://invisible-island.net/ncurses/ncurses.tar.gz"
   result=$? ; if [[ "$result" -gt 0 ]] ; then return $result ; fi
   __rvm_run "$package/extract" "tar zxf $rvm_archives_path/$package.$archive_format -C $rvm_src_path" "Extracting $package.$archive_format"
   builtin cd "$rvm_src_path/$package-$version"
   __rvm_run "$package/configure" "./configure --prefix=$rvm_path/usr --with-shared --disable-rpath --without-debug --without-ada --enable-safe-sprintf --enable-sigwinch --without-progs" "Configuring $package."
-  if [[ "$rvm_install_flag" -eq 1 ]] ; then
+  if [[ "$rvm_uninstall_flag" -eq 1 ]] || [[ "$rvm_remove_flag" -eq 1 ]] ; then
+    __rvm_run "$package/make.uninstall" "/usr/bin/make uninstall" "uninstalling $package from $rvm_path/usr"
+  else
     __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"
-  elif [[ "$rvm_uninstall_flag" -eq 1 ]] || [[ "$rvm_remove_flag" -eq 1 ]] ; then
-    __rvm_run "$package/make.uninstall" "/usr/bin/make uninstall" "uninstalling $package from $rvm_path/usr"
   fi
   __rvm_pushpop
 }
 
 __rvm_install_llvm() {