From 928d5a2475a1bc373c5f572a6dd5e7d4848eddf4 Mon Sep 17 00:00:00 2001 From: cytopia Date: Thu, 3 Feb 2022 10:01:56 +0100 Subject: [PATCH] Updated get-modules tests --- .tests/Makefile | 2 +- .tests/scripts/get-modules.sh | 47 ++++++++++++++++++++++++++++++++--- 2 files changed, 44 insertions(+), 5 deletions(-) diff --git a/.tests/Makefile b/.tests/Makefile index f0c3c72f..b4a5b4ba 100644 --- a/.tests/Makefile +++ b/.tests/Makefile @@ -8,7 +8,7 @@ endif # ------------------------------------------------------------------------------------------------- update-readme: cat "../README.md" \ - | perl -00 -pe "s#.*#\n$$(./scripts/get-modules.sh)\n#s" \ + | perl -0 -pe "s#.*#\n$$(./scripts/get-modules.sh)\n#s" \ > "../README.md.tmp" yes | mv -f "../README.md.tmp" "../README.md" diff --git a/.tests/scripts/get-modules.sh b/.tests/scripts/get-modules.sh index 627911de..17b75700 100755 --- a/.tests/scripts/get-modules.sh +++ b/.tests/scripts/get-modules.sh @@ -169,6 +169,18 @@ if ! PHP81_BASE="$( run "\ exit 1 fi +if ! PHP82_BASE="$( run "\ + curl -sS 'https://raw.githubusercontent.com/devilbox/docker-php-fpm/${PHP_TAG}/README.md' \ + | tac \ + | tac \ + | grep -E '82-base' \ + | sed \ + -e 's/.*\">//g' \ + -e 's/<.*//g'" "${RETRIES}" )"; then + >&2 echo "Failed to retrieve modules for PHP 8.2" + exit 1 +fi + ### ### Get PHP mods modules (5 rounds) ### @@ -317,10 +329,22 @@ if ! PHP81_MODS="$( run "\ exit 1 fi +if ! PHP82_MODS="$( run "\ + curl -sS 'https://raw.githubusercontent.com/devilbox/docker-php-fpm/${PHP_TAG}/README.md' \ + | tac \ + | tac \ + | grep -E '82-mods' \ + | sed \ + -e 's/.*\">//g' \ + -e 's/<.*//g'" "${RETRIES}" )"; then + >&2 echo "Failed to retrieve modules for PHP 8.2" + exit 1 +fi + ### ### Todo: add ioncube ### -MODS="$( echo "${PHP52_MODS}, ${PHP53_MODS}, ${PHP54_MODS}, ${PHP55_MODS}, ${PHP56_MODS}, ${PHP70_MODS}, ${PHP71_MODS}, ${PHP72_MODS}, ${PHP73_MODS}, ${PHP74_MODS}, ${PHP80_MODS}, ${PHP81_MODS}" | sed 's/,/\n/g' | sed -e 's/^\s*//g' -e 's/\s*$//g' | sort -uf )" +MODS="$( echo "${PHP52_MODS}, ${PHP53_MODS}, ${PHP54_MODS}, ${PHP55_MODS}, ${PHP56_MODS}, ${PHP70_MODS}, ${PHP71_MODS}, ${PHP72_MODS}, ${PHP73_MODS}, ${PHP74_MODS}, ${PHP80_MODS}, ${PHP81_MODS}, ${PHP82_MODS}" | sed 's/,/\n/g' | sed -e 's/^\s*//g' -e 's/\s*$//g' | sort -uf )" ### @@ -333,11 +357,11 @@ E="🗸" # Enabled mods modules (can be disabled) D="d" # Disabled modules (can be enabled) U=" " # Unavailable -echo "| Modules | PHP 5.2 | PHP 5.3 | PHP 5.4 | PHP 5.5 | PHP 5.6 | PHP 7.0 | PHP 7.1 | PHP 7.2 | PHP 7.3 | PHP 7.4 | PHP 8.0 | PHP 8.1 |" -echo "|-------------------------------|:-------:|:-------:|:-------:|:-------:|:-------:|:-------:|:-------:|:-------:|:-------:|:-------:|:-------:|:-------:|" +echo "| Modules | PHP 5.2 | PHP 5.3 | PHP 5.4 | PHP 5.5 | PHP 5.6 | PHP 7.0 | PHP 7.1 | PHP 7.2 | PHP 7.3 | PHP 7.4 | PHP 8.0 | PHP 8.1 | PHP 8.2 |" +echo "|-------------------------------|:-------:|:-------:|:-------:|:-------:|:-------:|:-------:|:-------:|:-------:|:-------:|:-------:|:-------:|:-------:|:-------:|" echo "${MODS}" | while read -r line; do # Print current module - printf "| %-30s%s" "${line}" "|" + printf "| %-30s%s" "${line}" "|" # ---------- PHP 5.2 ----------# if echo ",${PHP52_MODS}," | sed 's/,\s/,/g' | grep -Eq ",${line},"; then @@ -519,5 +543,20 @@ echo "${MODS}" | while read -r line; do printf " %s |" "${U}" # Not available fi + # ---------- PHP 8.2 ----------# + if echo ",${PHP82_MODS}," | sed 's/,\s/,/g' | grep -Eq ",${line},"; then + if echo "${DISABLED}" | grep -Eq ",${line},"; then + printf " %s |" "${D}" # Currently disabled + else + if echo ",${PHP82_BASE}," | sed 's/,\s/,/g' | grep -Eq ",${line},"; then + printf " %s |" "${B}" # Enabled, but cannot be disabled + else + printf " %s |" "${E}" # Enabled, can be disabled + fi + fi + else + printf " %s |" "${U}" # Not available + fi + printf "\\n" done