diff options
| -rw-r--r-- | README.md | 5 | ||||
| -rwxr-xr-x | kerl | 16 |
2 files changed, 16 insertions, 5 deletions
@@ -424,6 +424,11 @@ Prints the available builds and installations as well as the currently active in Changelog --------- +20 May 2016 - 1.1.1 + + - Remove valid directory check when doing a remote deployment. + - Various get_otp_version() regex cleanup/fixes + 14 May 2016 - 1.1.0 - Remove support for Mac OS X Lion. Stop setting CFLAGS for better compiler @@ -193,7 +193,7 @@ get_git_releases() get_tarball_releases() { - curl -L -s $ERLANG_DOWNLOAD_URL/ | \ + curl -q -L -s $ERLANG_DOWNLOAD_URL/ | \ sed $SED_OPT -e 's/^.*<[aA] [hH][rR][eE][fF]=\"\otp_src_([-0-9A-Za-z_.]+)\.tar\.gz\">.*$/\1/' \ -e '/^R1|^[0-9]/!d' | \ sed -e "s/^R\(.*\)/\1:R\1/" | sed -e "s/^\([^\:]*\)$/\1-z:\1/" | sort | cut -d':' -f2 @@ -206,7 +206,7 @@ update_checksum_file() return 0 else echo "Getting the checksum file from erlang.org..." - curl -L $ERLANG_DOWNLOAD_URL/MD5 > "$KERL_DOWNLOAD_DIR"/MD5 || exit 1 + curl -L -o "$KERL_DOWNLOAD_DIR/MD5" "$ERLANG_DOWNLOAD_URL/MD5" || exit 1 fi } @@ -367,7 +367,13 @@ do_git_build() get_otp_version() { - echo $1 | sed $SED_OPT -e 's/R?([0-9]{1,2})[.AB]?[-.0-9]*/\1/' + echo $1 | sed $SED_OPT -e 's/R?([0-9]{1,2})[.AB]?[-.0-9rc]*/\1/' +} + +get_javac_version() +{ + javaout=$(javac -version 2>&1) + echo "$javaout" | cut -d' ' -f2 | cut -d'.' -f2 } get_javac_version() @@ -1044,14 +1050,14 @@ github_download() { if [ ! -f "$KERL_DOWNLOAD_DIR/$1" ]; then echo "Downloading $1 to $KERL_DOWNLOAD_DIR" - curl -L "$OTP_GITHUB_URL/archive/$1" > "$KERL_DOWNLOAD_DIR/$1" + curl -L -o "$KERL_DOWNLOAD_DIR/$1" "$OTP_GITHUB_URL/archive/$1" fi } tarball_download() { if [ ! -f "$KERL_DOWNLOAD_DIR/$1" ]; then - curl -L "$ERLANG_DOWNLOAD_URL/$1" > "$KERL_DOWNLOAD_DIR/$1" + curl -L -o "$KERL_DOWNLOAD_DIR/$1" "$ERLANG_DOWNLOAD_URL/$1" update_checksum_file fi ensure_checksum_file |