commit
a19fcb2dee
|
@ -157,19 +157,19 @@ getPeclModuleName() {
|
||||||
#
|
#
|
||||||
# Output:
|
# Output:
|
||||||
# Nothing
|
# Nothing
|
||||||
processPHPMuduleArgument() {
|
processPHPModuleArgument() {
|
||||||
PROCESSED_PHP_MODULE_ARGUMENT="${1%%-*}"
|
PROCESSED_PHP_MODULE_ARGUMENT="${1%%-*}"
|
||||||
if test -n "$PROCESSED_PHP_MODULE_ARGUMENT" && test "$PROCESSED_PHP_MODULE_ARGUMENT" != "$1"; then
|
if test -n "$PROCESSED_PHP_MODULE_ARGUMENT" && test "$PROCESSED_PHP_MODULE_ARGUMENT" != "$1"; then
|
||||||
processPHPMuduleArgument_version="${1#*-}"
|
processPHPModuleArgument_version="${1#*-}"
|
||||||
else
|
else
|
||||||
processPHPMuduleArgument_version=''
|
processPHPModuleArgument_version=''
|
||||||
fi
|
fi
|
||||||
PROCESSED_PHP_MODULE_ARGUMENT="$(normalizePHPModuleName "$PROCESSED_PHP_MODULE_ARGUMENT")"
|
PROCESSED_PHP_MODULE_ARGUMENT="$(normalizePHPModuleName "$PROCESSED_PHP_MODULE_ARGUMENT")"
|
||||||
if test -n "$processPHPMuduleArgument_version"; then
|
if test -n "$processPHPModuleArgument_version"; then
|
||||||
if printf '%s' "$PROCESSED_PHP_MODULE_ARGUMENT" | grep -Eq '^[a-zA-Z0-9_]+$'; then
|
if printf '%s' "$PROCESSED_PHP_MODULE_ARGUMENT" | grep -Eq '^[a-zA-Z0-9_]+$'; then
|
||||||
eval PHP_WANTEDMODULEVERSION_$PROCESSED_PHP_MODULE_ARGUMENT="$processPHPMuduleArgument_version"
|
eval PHP_WANTEDMODULEVERSION_$PROCESSED_PHP_MODULE_ARGUMENT="$processPHPModuleArgument_version"
|
||||||
elif printf '%s' "$PROCESSED_PHP_MODULE_ARGUMENT" | grep -Eq '^@[a-zA-Z0-9_]+$'; then
|
elif printf '%s' "$PROCESSED_PHP_MODULE_ARGUMENT" | grep -Eq '^@[a-zA-Z0-9_]+$'; then
|
||||||
eval PHP_WANTEDMODULEVERSION__${PROCESSED_PHP_MODULE_ARGUMENT#@}="$processPHPMuduleArgument_version"
|
eval PHP_WANTEDMODULEVERSION__${PROCESSED_PHP_MODULE_ARGUMENT#@}="$processPHPModuleArgument_version"
|
||||||
else
|
else
|
||||||
printf 'Unable to parse the following module name:\n%s\n' "$PROCESSED_PHP_MODULE_ARGUMENT" >&2
|
printf 'Unable to parse the following module name:\n%s\n' "$PROCESSED_PHP_MODULE_ARGUMENT" >&2
|
||||||
fi
|
fi
|
||||||
|
@ -304,7 +304,7 @@ processCommandArguments() {
|
||||||
esac
|
esac
|
||||||
fi
|
fi
|
||||||
if test $processCommandArguments_skip -eq 0; then
|
if test $processCommandArguments_skip -eq 0; then
|
||||||
processPHPMuduleArgument "$1"
|
processPHPModuleArgument "$1"
|
||||||
processCommandArguments_name="$PROCESSED_PHP_MODULE_ARGUMENT"
|
processCommandArguments_name="$PROCESSED_PHP_MODULE_ARGUMENT"
|
||||||
if stringInList "$processCommandArguments_name" "$PHP_MODULES_TO_INSTALL"; then
|
if stringInList "$processCommandArguments_name" "$PHP_MODULES_TO_INSTALL"; then
|
||||||
printf '### WARNING Duplicated module name specified: %s ###\n' "$processCommandArguments_name" >&2
|
printf '### WARNING Duplicated module name specified: %s ###\n' "$processCommandArguments_name" >&2
|
||||||
|
|
Loading…
Reference in New Issue