Просмотр исходного кода

Fix check for curl symlink on Debian during build process (#2275)

Kristan Kenney 4 лет назад
Родитель
Сommit
336decf49b
2 измененных файлов с 4 добавлено и 8 удалено
  1. 2 4
      bin/v-update-sys-hestia-git
  2. 2 4
      src/hst_autocompile.sh

+ 2 - 4
bin/v-update-sys-hestia-git

@@ -158,11 +158,9 @@ echo "[*] Checking for missing dependencies and installing required libraries...
 apt-get -qq install -y $SOFTWARE > /dev/null 2>&1
 apt-get -qq install -y $SOFTWARE > /dev/null 2>&1
 
 
 # Fix for Debian PHP Envroiment
 # Fix for Debian PHP Envroiment
-if [ ! -e /usr/local/include/curl ]; then
-    if [ $BUILD_ARCH == "amd64" ]; then
+if [ $BUILD_ARCH == "amd64" ]; then
+    if [ ! -L /usr/local/include/curl ]; then
         ln -s /usr/include/x86_64-linux-gnu/curl /usr/local/include/curl
         ln -s /usr/include/x86_64-linux-gnu/curl /usr/local/include/curl
-    else
-        echo "No x86_64 working"
     fi
     fi
 fi
 fi
 
 

+ 2 - 4
src/hst_autocompile.sh

@@ -257,11 +257,9 @@ if [ "$dontinstalldeps" != 'true' ]; then
         apt-get -qq install -y $SOFTWARE > /dev/null 2>&1
         apt-get -qq install -y $SOFTWARE > /dev/null 2>&1
 
 
         # Fix for Debian PHP Envroiment
         # Fix for Debian PHP Envroiment
-        if [ ! -e /usr/local/include/curl ]; then
-            if [ $BUILD_ARCH == "amd64" ]; then
+        if [ $BUILD_ARCH == "amd64" ]; then
+            if [ ! -L /usr/local/include/curl ]; then
                 ln -s /usr/include/x86_64-linux-gnu/curl /usr/local/include/curl
                 ln -s /usr/include/x86_64-linux-gnu/curl /usr/local/include/curl
-            else
-                echo "No x86_64 working"
             fi
             fi
         fi
         fi
     fi
     fi