Skip to content

Commit baab28a

Browse files
committed
Fix extension setup
1 parent d58b967 commit baab28a

File tree

1 file changed

+5
-10
lines changed

1 file changed

+5
-10
lines changed

src/scripts/linux.sh

+5-10
Original file line numberDiff line numberDiff line change
@@ -89,9 +89,7 @@ pecl_install() {
8989

9090
# Function to enable existing extensions.
9191
enable_extension() {
92-
if [ -e /tmp/setup_php_dismod ] && grep -q "$1" /tmp/setup_php_dismod; then
93-
sudo phpenmod -v "$version" "$1" >/dev/null 2>&1
94-
fi
92+
sudo find /var/lib/php/modules/"$version" -path "*disabled*$1" -delete
9593
if ! check_extension "$1" && [ -e "$ext_dir/$1.so" ]; then
9694
echo "$2=$ext_dir/$1.so" | sudo tee -a "$pecl_file" >/dev/null
9795
fi
@@ -114,14 +112,14 @@ delete_extension() {
114112
sudo sed -Ei "/=(.*\/)?\"?$extension/d" "$pecl_file"
115113
sudo rm -rf "$scan_dir"/*"$extension"* >/dev/null 2>&1
116114
sudo rm -rf "$ext_dir"/"$extension".so >/dev/null 2>&1
115+
sudo sed -i "/Package: php$version-$extension/,/^$/d" /var/lib/dpkg/status
117116
}
118117

119118
# Function to disable and delete extensions
120119
remove_extension() {
121120
extension=$1
122121
if [ -e /etc/php/"$version"/mods-available/"$extension".ini ]; then
123122
sudo phpdismod -v "$version" "$extension"
124-
echo "$extension" | sudo tee -a /tmp/setup_php_dismod >/dev/null 2>&1
125123
fi
126124
delete_extension "$extension"
127125
}
@@ -131,9 +129,8 @@ add_extension() {
131129
extension=$1
132130
install_command=$2
133131
prefix=$3
134-
if ! check_extension "$extension" && [ -e "$ext_dir/$extension.so" ]; then
135-
echo "$prefix=$extension.so" >>"$ini_file" && add_log "$tick" "$extension" "Enabled"
136-
elif check_extension "$extension"; then
132+
enable_extension "$extension" "$prefix"
133+
if check_extension "$extension"; then
137134
add_log "$tick" "$extension" "Enabled"
138135
elif ! check_extension "$extension"; then
139136
eval "$install_command" >/dev/null 2>&1 ||
@@ -153,9 +150,7 @@ add_pecl_extension() {
153150
if [[ $pecl_version =~ .*(alpha|beta|rc|snapshot|preview).* ]]; then
154151
pecl_version=$(get_pecl_version "$extension" "$pecl_version")
155152
fi
156-
if ! check_extension "$extension" && [ -e "$ext_dir/$extension.so" ]; then
157-
echo "$prefix=$ext_dir/$extension.so" >>"$pecl_file"
158-
fi
153+
enable_extension "$extension" "$prefix"
159154
ext_version=$(php -r "echo phpversion('$extension');")
160155
if [ "$ext_version" = "$pecl_version" ]; then
161156
add_log "$tick" "$extension" "Enabled"

0 commit comments

Comments
 (0)