From 3e5a8994cf7f3de2e4b1a2749a29d2a0a9c50615 Mon Sep 17 00:00:00 2001 From: Shivam Mathur Date: Sun, 15 Nov 2020 18:52:43 +0530 Subject: [PATCH] Fix extension setup on self-hosted linux --- src/scripts/common.sh | 3 +++ src/scripts/linux.sh | 2 ++ 2 files changed, 5 insertions(+) diff --git a/src/scripts/common.sh b/src/scripts/common.sh index e92a47f4..16062114 100644 --- a/src/scripts/common.sh +++ b/src/scripts/common.sh @@ -103,6 +103,9 @@ check_extension() { # Function to enable existing extensions. enable_extension() { + if [ -e /tmp/setup_php_dismod ] && grep -q "$1" /tmp/setup_php_dismod; then + sudo phpenmod -v "$version" "$1" >/dev/null 2>&1 + fi if ! check_extension "$1" && [ -e "${ext_dir:?}/$1.so" ]; then echo "$2=${ext_dir:?}/$1.so" >>"${pecl_file:-$ini_file}" fi diff --git a/src/scripts/linux.sh b/src/scripts/linux.sh index 4895f03e..cab30499 100644 --- a/src/scripts/linux.sh +++ b/src/scripts/linux.sh @@ -62,11 +62,13 @@ remove_extension() { if check_extension "$extension"; then if [[ ! "$version" =~ ${old_versions:?} ]] && [ -e /etc/php/"$version"/mods-available/"$extension".ini ]; then sudo phpdismod -v "$version" "$extension" >/dev/null 2>&1 + echo "$extension" | sudo tee -a /tmp/setup_php_dismod >/dev/null 2>&1 fi delete_extension "$extension" (! check_extension "$extension" && add_log "${tick:?}" ":$extension" "Removed") || add_log "${cross:?}" ":$extension" "Could not remove $extension on PHP ${semver:?}" else + delete_extension "$extension" add_log "${tick:?}" ":$extension" "Could not find $extension on PHP $semver" fi }