From 56bccd050f89aff5002337a300e6c7feb6413b24 Mon Sep 17 00:00:00 2001 From: sanmiguel Date: Wed, 7 Dec 2016 21:31:59 +0100 Subject: Allow an underscore-prefixed alphanum suffix to the OTP version This helps supporting custom forks of OTP e.g. basho/otp --- kerl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kerl b/kerl index 4fc05f5..98fb6f8 100755 --- a/kerl +++ b/kerl @@ -375,7 +375,7 @@ do_git_build() get_otp_version() { - echo $1 | sed $SED_OPT -e 's/R?([0-9]{1,2})[.AB]?[-.0-9rc]*/\1/' + echo $1 | sed $SED_OPT -e 's/R?([0-9]{1,2})[.AB]?[-.0-9rc]*(_[a-zA-Z0-9]*)?/\1/' } get_perl_version() -- cgit v1.2.3 From e521d3be7c188e454eb987b776e9f91228f8df99 Mon Sep 17 00:00:00 2001 From: sanmiguel Date: Fri, 9 Dec 2016 20:56:42 +0100 Subject: Greatly simplify regex used --- kerl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kerl b/kerl index 98fb6f8..40e9f1f 100755 --- a/kerl +++ b/kerl @@ -375,7 +375,7 @@ do_git_build() get_otp_version() { - echo $1 | sed $SED_OPT -e 's/R?([0-9]{1,2})[.AB]?[-.0-9rc]*(_[a-zA-Z0-9]*)?/\1/' + echo $1 | sed $SED_OPT -e 's/R?([0-9]{1,2}).+/\1/' } get_perl_version() -- cgit v1.2.3