fix.sh in checkoff-0.15.2 vs fix.sh in checkoff-0.16.0

- old
+ new

@@ -5,11 +5,11 @@ apt_upgraded=0 update_apt() { if [ "${apt_upgraded}" = 0 ] then - sudo apt-get update -y + sudo DEBIAN_FRONTEND=noninteractive apt-get update -y apt_upgraded=1 fi } install_rbenv() { @@ -241,11 +241,11 @@ then HOMEBREW_NO_AUTO_UPDATE=1 brew install "${homebrew_package}" elif type apt-get >/dev/null 2>&1 then update_apt - sudo apt-get install -y "${apt_package}" + sudo DEBIAN_FRONTEND=noninteractive apt-get install -y "${apt_package}" else >&2 echo "Teach me how to install packages on this plaform" exit 1 fi } @@ -255,11 +255,11 @@ ensure_dev_library bzlib.h bzip2 libbz2-dev ensure_dev_library openssl/ssl.h openssl libssl-dev ensure_dev_library ffi.h libffi libffi-dev ensure_dev_library sqlite3.h sqlite3 libsqlite3-dev ensure_dev_library lzma.h xz liblzma-dev - ensure_dev_library readline.h readline libreadline-dev + ensure_dev_library readline/readline.h readline libreadline-dev } # You can find out which feature versions are still supported / have # been release here: https://www.python.org/downloads/ ensure_python_versions() { @@ -273,11 +273,15 @@ for ver in $python_versions do if [ "$(uname)" == Darwin ] then + if [ -z "${HOMEBREW_OPENSSL_PREFIX:-}" ] + then + HOMEBREW_OPENSSL_PREFIX="$(brew --prefix openssl)" + fi pyenv_install() { - CFLAGS="-I/usr/local/opt/zlib/include -I/usr/local/opt/bzip2/include" LDFLAGS="-L/usr/local/opt/zlib/lib -L/usr/local/opt/bzip2/lib" pyenv install --skip-existing "$@" + CFLAGS="-I/usr/local/opt/zlib/include -I/usr/local/opt/bzip2/include -I${HOMEBREW_OPENSSL_PREFIX}/include" LDFLAGS="-L/usr/local/opt/zlib/lib -L/usr/local/opt/bzip2/lib -L${HOMEBREW_OPENSSL_PREFIX}/lib" pyenv install --skip-existing "$@" } major_minor="$(cut -d. -f1-2 <<<"${ver}")" if [ "${major_minor}" == 3.6 ] then