The registry dir needs to be versioned as well
This commit is contained in:
parent
828f45f452
commit
b384c3301d
5
debian/php-common.postinst
vendored
5
debian/php-common.postinst
vendored
|
@ -8,6 +8,11 @@ if [ "$1" = "configure" ]; then
|
|||
fi
|
||||
fi
|
||||
|
||||
# Remove old registry directory
|
||||
if [ -d "/var/lib/php/modules/registry" ]; then
|
||||
rm -r /var/lib/php/modules/registry;
|
||||
fi
|
||||
|
||||
#DEBHELPER#
|
||||
|
||||
exit 0
|
||||
|
|
|
@ -40,8 +40,9 @@ remove_state() {
|
|||
|
||||
mod_registry() {
|
||||
local action=$1
|
||||
local modname=$2
|
||||
local registry_dir="$(get_registry_dir)"
|
||||
local version=$2
|
||||
local modname=$3
|
||||
local registry_dir="$(get_registry_dir "$version")"
|
||||
local registry_file="${registry_dir}/${modname}"
|
||||
|
||||
case $action in
|
||||
|
@ -167,7 +168,8 @@ get_state_dir() {
|
|||
}
|
||||
|
||||
get_registry_dir() {
|
||||
echo "/var/lib/php/modules/registry"
|
||||
local version=$1
|
||||
echo "/var/lib/php/modules/${version}/registry"
|
||||
return 0
|
||||
}
|
||||
|
||||
|
|
|
@ -216,7 +216,7 @@ php_invoke()
|
|||
sapi_list=$(phpquery -S -v $VERSION)
|
||||
case "$CMD" in
|
||||
enmod|dismod)
|
||||
php$CMD -q -m -r "$MOD" || return 1
|
||||
php$CMD -q -v "$VERSION" -m -r "$MOD" || return 1
|
||||
;;
|
||||
*)
|
||||
return 1
|
||||
|
|
10
phpenmod
10
phpenmod
|
@ -77,10 +77,10 @@ enmods() {
|
|||
;;
|
||||
esac
|
||||
done
|
||||
if [ "$register" = "yes" ]; then
|
||||
mod_registry register "$version" "$mod"
|
||||
fi
|
||||
done
|
||||
if [ "$register" = "yes" ]; then
|
||||
mod_registry register "$mod"
|
||||
fi
|
||||
done
|
||||
}
|
||||
|
||||
|
@ -110,9 +110,9 @@ dismods() {
|
|||
if [ "$purge" = "yes" ]; then
|
||||
remove_state enabled "$version" "$sapi" "$mod"
|
||||
remove_state disabled "$version" "$sapi" "$mod"
|
||||
mod_registry unregister "$mod"
|
||||
mod_registry unregister "$version" "$mod"
|
||||
elif [ "$register" = "yes" ]; then
|
||||
mod_registry unregister "$mod"
|
||||
mod_registry unregister "$version" "$mod"
|
||||
fi
|
||||
done
|
||||
}
|
||||
|
|
27
phpquery
27
phpquery
|
@ -89,16 +89,17 @@ list_mod() {
|
|||
local _version=$1
|
||||
local _sapi=$2
|
||||
local verbose=$3
|
||||
local registry_dir="$(get_registry_dir)"
|
||||
|
||||
if [ -d "$registry_dir" ]; then
|
||||
for mod in $(list_parts "$registry_dir"); do
|
||||
if [ "$_version" = "ALL" ]; then
|
||||
versions=$(list_version)
|
||||
else
|
||||
versions=$_version
|
||||
fi
|
||||
for version in $versions; do
|
||||
if [ "$_version" = "ALL" ]; then
|
||||
versions=$(list_version)
|
||||
else
|
||||
versions=$_version
|
||||
fi
|
||||
|
||||
for version in $versions; do
|
||||
local registry_dir="$(get_registry_dir "$version")"
|
||||
if [ -d "$registry_dir" ]; then
|
||||
for mod in $(list_parts "$registry_dir"); do
|
||||
if [ "$_sapi" = "ALL" ]; then
|
||||
sapis=$(list_sapi $version)
|
||||
else
|
||||
|
@ -112,15 +113,15 @@ list_mod() {
|
|||
echo $mod
|
||||
fi
|
||||
done
|
||||
done
|
||||
return 0
|
||||
fi
|
||||
return 1
|
||||
fi
|
||||
done
|
||||
return 0
|
||||
}
|
||||
|
||||
list_version() {
|
||||
local version_dir="$(get_version_dir)"
|
||||
if [ -d "$version_dir" ]; then
|
||||
local version=
|
||||
for version in $(list_parts_regex "$version_dir" '.*[0-9]\.[0-9]'); do
|
||||
echo $version;
|
||||
done
|
||||
|
|
Loading…
Reference in a new issue