From 6e4878073196cbf9e6a9d0f9c144e1ae6ef353d2 Mon Sep 17 00:00:00 2001 From: Ben Ramsey Date: Tue, 3 Dec 2019 18:07:07 -0800 Subject: [PATCH] Only remove the last dot if it is an X.Y.Z version number --- resources/scripts/cmd-proxy.sh | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/resources/scripts/cmd-proxy.sh b/resources/scripts/cmd-proxy.sh index 151c4d3..0e4b035 100755 --- a/resources/scripts/cmd-proxy.sh +++ b/resources/scripts/cmd-proxy.sh @@ -6,7 +6,12 @@ # on the local system, rather than in a container. php_version="${TRAVIS_PHP_VERSION:-$(php -r "echo phpversion();")}" -php_version="${php_version%.*}" + +dots_count=$(echo $php_version | awk -F"." '{print NF-1}') +if [ $dots_count -ge 2 ]; then + php_version="${php_version%.*}" +fi + architecture="${ARCH:-${TRAVIS_CPU_ARCH:-$(uname -m)}}" cmd_proxy=""