diff options
| -rw-r--r-- | README.md | 11 | ||||
| -rwxr-xr-x | kerl | 25 |
2 files changed, 25 insertions, 11 deletions
@@ -696,6 +696,17 @@ will eventually deal with this issue. Changelog --------- +25 September 2018 - 1.8.5 + + - Support Mojave builds (#301) + - Disable SC2207 for Bash completion (#296) + +3 August 2018 - 1.8.4 + + - Support docsh 0.6.1 (#290) + - Update docs about KERL_INSTALL_MANPAGES & HTML_DOCS (#292) + - Fix bash completion for Bash 3 (#295) + 3 July 2018 - 1.8.3 - Update testing to include OTP 21 (#286) @@ -27,7 +27,7 @@ unset ERL_TOP # Make sure CDPATH doesn't affect cd in case path is relative. unset CDPATH -KERL_VERSION='1.8.4' +KERL_VERSION='1.8.5' DOCSH_GITHUB_URL='https://github.com/erszcz/docsh.git' ERLANG_DOWNLOAD_URL='https://www.erlang.org/download' @@ -287,7 +287,7 @@ get_newest_valid_release() { rel=$(tail -1 "$KERL_BASE_DIR"/otp_releases) - if [ ! -z "$rel" ]; then + if [ -n "$rel" ]; then echo "$rel" return 0 fi @@ -591,13 +591,13 @@ do_normal_build() { } _flags() { - # We need to munge the LD and DED flags for clang 9 shipped with - # High Sierra (macOS 10.13) + # We need to munge the LD and DED flags for clang 9/10 shipped with + # High Sierra (macOS 10.13) and Mojave (macOS 10.14) case "$KERL_SYSTEM" in Darwin) osver=$(uname -r) case "$osver" in - 17*) + 18*|17*) # Make sure we don't overwrite values that someone who # knows better than us set. if [ -z "$DED_LD" ]; then @@ -636,7 +636,7 @@ _do_build() { fi case "$OSVERSION" in - 17*|16*|15*) + 18*|17*|16*|15*) if ! echo "$KERL_CONFIGURE_OPTIONS" | grep 'ssl' >/dev/null 2>&1; then whichbrew=$(command -v brew) if [ -n "$whichbrew" ] && [ -x "$whichbrew" ]; then @@ -1148,12 +1148,12 @@ install_docsh() { GIT=$(printf '%s' $REPO_URL | $MD5SUM | cut -d' ' -f $MD5SUM_FIELD) BUILDNAME="$1" DOCSH_DIR="$KERL_BUILD_DIR/$BUILDNAME/docsh" - DOCSH_REF='0.6.1' + DOCSH_REF='0.7.1' ACTIVE_PATH="$2" OTP_VERSION=$(get_otp_version "$1") # This has to be updated with docsh updates - DOCSH_SUPPORTED='^1[89]\|2[01]$' + DOCSH_SUPPORTED='^1[9]\|2[01]$' if ! echo "$OTP_VERSION" | grep "$DOCSH_SUPPORTED" >/dev/null 2>&1; then echo "Erlang/OTP version $OTP_VERSION not supported by docsh (does not match regex $DOCSH_SUPPORTED)" exit 1 @@ -1304,7 +1304,7 @@ do_deploy() { path="$2" remotepath="$path" - if [ ! -z "$3" ]; then + if [ -n "$3" ]; then remotepath="$3" fi @@ -1889,11 +1889,14 @@ case "$1" in fi do_git_build "$3" "$4" "$5" else - if [ $# -lt 3 ]; then + if [ $# -eq 2 ]; then + do_normal_build "$2" "$2" + elif [ $# -eq 3 ]; then + do_normal_build "$2" "$3" + else echo "usage: $0 $1 <release> <build_name>" exit 1 fi - do_normal_build "$2" "$3" fi ;; install) |