From 69f9564a6db8ced1b5fbfc7f20c644abd54fca11 Mon Sep 17 00:00:00 2001
From: analysisjp <akirachanjp@gmail.com>
Date: Tue, 13 Feb 2024 21:49:23 +0900
Subject: [PATCH] fixed webui.sh issue that occurred in WSL environment (fix:
 #14883)

---
 webui.sh | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/webui.sh b/webui.sh
index 794cfb8ae..f116376f7 100755
--- a/webui.sh
+++ b/webui.sh
@@ -227,9 +227,7 @@ fi
 prepare_tcmalloc() {
     if [[ "${OSTYPE}" == "linux"* ]] && [[ -z "${NO_TCMALLOC}" ]] && [[ -z "${LD_PRELOAD}" ]]; then
         # check glibc version
-        LIBC_LIB="$(PATH=/usr/sbin:$PATH ldconfig -p | grep -P "libc.so.6" | head -n 1)"
-        LIBC_INFO=$(echo ${LIBC_LIB} | awk '{print $NF}')
-        LIBC_VER=$(echo $(${LIBC_INFO} | awk 'NR==1 {print $NF}') | grep -oP '\d+\.\d+')
+        LIBC_VER=$(echo $(ldd --version | awk 'NR==1 {print $NF}') | grep -oP '\d+\.\d+')
         echo "glibc version is $LIBC_VER"
         libc_vernum=$(expr $LIBC_VER)
         # Since 2.34 libpthread is integrated into libc.so
@@ -244,9 +242,9 @@ prepare_tcmalloc() {
             TC_INFO=(${TCMALLOC//=>/})
             if [[ ! -z "${TC_INFO}" ]]; then
                 echo "Check TCMalloc: ${TC_INFO}"
-                # Determine if the library is linked to libptthread and resolve undefined symbol: ptthread_key_create
+                # Determine if the library is linked to libpthread and resolve undefined symbol: pthread_key_create
                 if [ $(echo "$libc_vernum < $libc_v234" | bc) -eq 1 ]; then
-                    # glibc < 2.33 pthread_key_create into libpthead.so. check linking libpthread.so...
+                    # glibc < 2.34 pthread_key_create into libpthread.so. check linking libpthread.so...
                     if ldd ${TC_INFO[2]} | grep -q 'libpthread'; then
                         echo "$TC_INFO is linked with libpthread,execute LD_PRELOAD=${TC_INFO[2]}"
                         # set fullpath LD_PRELOAD (To be on the safe side)
@@ -256,7 +254,7 @@ prepare_tcmalloc() {
                         echo "$TC_INFO is not linked with libpthread will trigger undefined symbol: pthread_Key_create error"
                     fi
                 else
-                    # Version 2.34 of libc.so (glibc) includes the pthead library IN GLIBC. (USE ubuntu 22.04 and modern linux system and WSL)
+                    # Version 2.34 of libc.so (glibc) includes the pthread library IN GLIBC. (USE ubuntu 22.04 and modern linux system and WSL)
                     # libc.so(glibc) is linked with a library that works in ALMOST ALL Linux userlands. SO NO CHECK!
                     echo "$TC_INFO is linked with libc.so,execute LD_PRELOAD=${TC_INFO[2]}"
                     # set fullpath LD_PRELOAD (To be on the safe side)
@@ -266,7 +264,7 @@ prepare_tcmalloc() {
             fi
         done
         if [[ -z "${LD_PRELOAD}" ]]; then
-            printf "\e[1m\e[31mCannot locate TCMalloc. Do you have tcmalloc or gperftools installed on your system? (improves CPU memory usage)\e[0m\n"
+            printf "\e[1m\e[31mCannot locate TCMalloc. Do you have tcmalloc or google-perftool installed on your system? (improves CPU memory usage)\e[0m\n"
         fi
     fi
 }
-- 
GitLab