From b33fbfb3dc22aa4a5cd664cb819ca7ab9be608f5 Mon Sep 17 00:00:00 2001
From: Teddysun <i@teddysun.com>
Date: Sun, 20 Nov 2022 16:38:19 +0900
Subject: [PATCH] Update comments Fixed issue #247

Signed-off-by: Teddysun <i@teddysun.com>
---
 include/apache.sh      | 2 +-
 include/php-modules.sh | 2 +-
 include/php.sh         | 2 +-
 include/upgrade_php.sh | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/include/apache.sh b/include/apache.sh
index 4e0ee2f..d9289dc 100644
--- a/include/apache.sh
+++ b/include/apache.sh
@@ -46,7 +46,7 @@ install_apache(){
     fi
     _info "Install dependencies for Apache completed..."
 
-    if ! grep -qE "^/usr/local/lib" /etc/ld.so.conf.d/*.conf; then
+    if ! grep -q -w -E "^/usr/local/lib" /etc/ld.so.conf.d/*.conf && [ -d "/usr/local/lib" ]; then
         echo "/usr/local/lib" > /etc/ld.so.conf.d/locallib.conf
     fi
     ldconfig
diff --git a/include/php-modules.sh b/include/php-modules.sh
index d77476d..549e81b 100644
--- a/include/php-modules.sh
+++ b/include/php-modules.sh
@@ -207,7 +207,7 @@ install_libiconv(){
         error_detect "parallel_make"
         error_detect "make install"
         create_lib64_dir "${depends_prefix}/libiconv"
-        if ! grep -qE "^${depends_prefix}/libiconv/lib" /etc/ld.so.conf.d/*.conf; then
+        if ! grep -q -w -E "^${depends_prefix}/libiconv/lib" /etc/ld.so.conf.d/*.conf; then
             echo "${depends_prefix}/libiconv/lib" > /etc/ld.so.conf.d/libiconvlib.conf
         fi
         _info "Install ${libiconv_filename} completed..."
diff --git a/include/php.sh b/include/php.sh
index 7926800..236a526 100644
--- a/include/php.sh
+++ b/include/php.sh
@@ -110,7 +110,7 @@ install_php(){
         cd ${php8_1_filename}
     fi
 
-    if ! grep -qE "^/usr/local/lib64" /etc/ld.so.conf.d/*.conf && [ -d "/usr/local/lib64" ]; then
+    if ! grep -q -w -E "^/usr/local/lib64" /etc/ld.so.conf.d/*.conf && [ -d "/usr/local/lib64" ]; then
         echo "/usr/local/lib64" > /etc/ld.so.conf.d/locallib64.conf
     fi
     ldconfig
diff --git a/include/upgrade_php.sh b/include/upgrade_php.sh
index b03db47..5b22381 100644
--- a/include/upgrade_php.sh
+++ b/include/upgrade_php.sh
@@ -76,7 +76,7 @@ upgrade_php(){
         fi
 
         [ ! -e "${depends_prefix}/libiconv/bin/iconv" ] && install_libiconv
-        if ! grep -qE "^${depends_prefix}/libiconv/lib" /etc/ld.so.conf.d/*.conf; then
+        if ! grep -q -w -E "^${depends_prefix}/libiconv/lib" /etc/ld.so.conf.d/*.conf; then
             echo "${depends_prefix}/libiconv/lib" > /etc/ld.so.conf.d/libiconvlib.conf
         fi