aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Allen <[email protected]>2018-03-10 14:07:16 -0600
committerGitHub <[email protected]>2018-03-10 14:07:16 -0600
commit27f81595e29cb2331fdf2377a008f22aa085d55c (patch)
treece07f7f319fab94f36fec8c461b729988de9d1e1
parent3dec2a56b3d0b2f4391871450349f5db2fa9ef94 (diff)
parent12ed0a95433e13bf039abacc0317ffc299d3ddcb (diff)
downloadkerl-27f81595e29cb2331fdf2377a008f22aa085d55c.tar.gz
kerl-27f81595e29cb2331fdf2377a008f22aa085d55c.tar.bz2
kerl-27f81595e29cb2331fdf2377a008f22aa085d55c.zip
Merge pull request #267 from erszcz/master
Install docsh 0.5.0
-rw-r--r--README.md2
-rwxr-xr-xkerl4
2 files changed, 3 insertions, 3 deletions
diff --git a/README.md b/README.md
index 7148a61..5db2901 100644
--- a/README.md
+++ b/README.md
@@ -621,7 +621,7 @@ other tools to extract to path information.
kerl install-docsh
-**Important note**: docsh currently only supports OTP 18 and 19.
+**Important note**: docsh only supports OTP versions 18 and later.
Install `erl` shell documentation access
extension - [docsh](https://github.com/erszcz/docsh).
diff --git a/kerl b/kerl
index b669426..e852652 100755
--- a/kerl
+++ b/kerl
@@ -1156,12 +1156,12 @@ install_docsh() {
GIT=$(echo -n $REPO_URL | $MD5SUM | cut -d ' ' -f $MD5SUM_FIELD)
BUILDNAME=$1
DOCSH_DIR="$KERL_BUILD_DIR/$BUILDNAME/docsh"
- DOCSH_REF="0.4.0"
+ DOCSH_REF="0.5.0"
ACTIVE_PATH=$2
OTP_VERSION=$(get_otp_version $1)
# This has to be updated with docsh updates
- DOCSH_SUPPORTED="^1[89]$"
+ DOCSH_SUPPORTED="^1[89]\|20$"
echo $OTP_VERSION | grep "$DOCSH_SUPPORTED" > /dev/null 2>&1
if [ $? -ne 0 ]; then
echo "Erlang/OTP version $OTP_VERSION not supported by docsh (does not match regex $DOCSH_SUPPORTED)"