Permalink
Browse files

Merge branch 'hotfix/1.29.1' into stable

  • Loading branch information...
2 parents 017b83d + ed8bf03 commit 9e36f2a97cb567456c3bcf4c51b08ac96282b533 @mpapis mpapis committed Feb 19, 2017
Showing with 42 additions and 17 deletions.
  1. +17 −1 CHANGELOG.md
  2. +1 −1 VERSION
  3. +2 −4 scripts/cli
  4. +7 −5 scripts/functions/requirements/osx_brew
  5. +13 −4 scripts/functions/requirements/ubuntu
  6. +2 −2 scripts/info
View
@@ -2,7 +2,23 @@
## [Unreleased](https://github.com/rvm/rvm/tree/HEAD)
-[Full Changelog](https://github.com/rvm/rvm/compare/1.28.0...HEAD)
+[Full Changelog](https://github.com/rvm/rvm/compare/1.29.1...HEAD)
+
+
+## [1.29.1](https://github.com/rvm/rvm/tag/1.29.1)
+
+19 February 2017 - [Full Changelog](https://github.com/rvm/rvm/compare/1.29.0...1.29.1)
+
+#### Bug fixes:
+* Fix using ruby from current dir when no params [\#3880](https://github.com/rvm/rvm/issues/3880)
+* Fix Ruby/Openssl installation on OSX [\#3923](https://github.com/rvm/rvm/issues/3923)
+* Fix rvm info to be yaml compatible [\#3924](https://github.com/rvm/rvm/issues/3924)
+* Add explicit architecture check for debian/ubuntu [\#3927](https://github.com/rvm/rvm/issues/3927)
+* Fix detecting openssl path for ruby24 [\#3928](https://github.com/rvm/rvm/issues/3928)
+
+## [1.29.0](https://github.com/rvm/rvm/tag/1.29.0)
+
+12 February 2017 - [Full Changelog](https://github.com/rvm/rvm/compare/1.28.0...1.29.0)
#### Security fixes:
* add trusting working directory hooks
View
@@ -1 +1 @@
-1.29.0
+1.29.1
View
@@ -117,10 +117,8 @@ __rvm_parse_args()
[[ -z "${next_token:-}" ]] &&
__rvm_project_dir_check .
then
- rvm_ruby_interpreter="."
- rvm_ruby_string="."
- rvm_ruby_strings="."
- RVM_PROJECT_PATH="$PWD"
+ __rvm_rvmrc_tools try_to_read_ruby . ||
+ __rvm_parse_args_error_finding_project_file
fi
;;
@@ -180,26 +180,27 @@ requirements_osx_brew_after()
requirements_osx_brew_libs_default_check_gcc42 || return $?
requirements_osx_brew_libs_set_path "${brew_libs[@]}" || return $?
requirements_osx_brew_libs_configure "$1" "${brew_libs_conf[@]}" || return $?
- unset brew_libs brew_libs_conf
case "$1" in
(jruby*) true ;;
(*) requirements_osx_brew_after_update_certs_openssl "$1" ;;
esac
+
+ unset brew_libs brew_libs_conf brew_openssl_package
}
requirements_osx_brew_after_update_certs_openssl()
{
\typeset brew_lib_prefix
if
- requirements_osx_brew_lib_installed_prefix_check openssl &&
+ requirements_osx_brew_lib_installed_prefix_check "$brew_openssl_package" &&
[[ -x "${brew_lib_prefix}/bin/openssl" ]]
then
requirements_osx_update_openssl_cert "${brew_lib_prefix}/bin/openssl" || return $?
else
rvm_requiremnts_fail_always 2 \
"Somehow it happened there is no executable 'openssl',
-run 'brew doctor' and make sure latest '${openssl_name}' is installed properly." ||
+run 'brew doctor' and make sure latest '$brew_openssl_package' is installed properly." ||
return 12 # passing by 127 could be read as missing rvm.
fi
}
@@ -315,13 +316,14 @@ requirements_osx_brew_libs_default()
# OpenSSL version depends on the version of Ruby being installed
case "$1" in
(ruby-2.3*|ruby-2.2*|ruby-2.1*|ruby-2.0*|ruby-1.9*)
- brew_libs+=( openssl )
+ brew_openssl_package="openssl"
;;
(*)
- brew_libs+=( openssl@1.1 )
+ brew_openssl_package="openssl@1.1"
;;
esac
+ brew_libs_conf+=( "$brew_openssl_package" )
undesired_check openssl098 || return $?
@@ -1,16 +1,22 @@
#!/usr/bin/env bash
+# AMD64, i386, ARM - this is differenet from _system_arch as it's not translated.
+requirements_debian_arch()
+{
+ __architecture="$(dpkg --print-architecture)"
+}
+
# Queries the dpkg system for packages that are installed only asking about
# the package name and it's arch. This package will fall back to :all for
# cases where we cannot get an arch specific package (such is the case
# for a few packages.)
requirements_debian_lib_installed()
{
- dpkg-query -s "${1}:${_system_arch}" >/dev/null 2>&1 ||
- dpkg-query -s "${1}:all" >/dev/null 2>&1 ||
- dpkg-query -s "$1" 2>/dev/null | __rvm_grep "Architecture: ${_system_arch}" >/dev/null ||
- dpkg-query -s "$1" 2>/dev/null | __rvm_grep "Architecture: all" >/dev/null ||
+ dpkg-query -s "${1}:${__architecture}" >/dev/null 2>&1 ||
+ dpkg-query -s "${1}:all" >/dev/null 2>&1 ||
+ dpkg-query -s "$1" 2>/dev/null | __rvm_grep "Architecture: ${__architecture}" >/dev/null ||
+ dpkg-query -s "$1" 2>/dev/null | __rvm_grep "Architecture: all" >/dev/null ||
return $?
}
@@ -91,6 +97,9 @@ requirements_debian_define_java()
requirements_debian_define()
{
+ \typeset __architecture
+ requirements_debian_arch
+
case "$1" in
(rvm)
requirements_check bash curl patch bzip2 ca-certificates gawk
View
@@ -79,10 +79,10 @@ info_rvm()
rvm_info="${rvm_info}just now"
fi
else
- rvm_info="${rvm_info}can not read installation time\n"
+ rvm_info="${rvm_info}can not read installation time"
fi
- rvm_info="${rvm_info}
+ rvm_info="${rvm_info}\"
path: \"$rvm_path\""
__rvm_autolibs_get

0 comments on commit 9e36f2a

Please sign in to comment.