Merge branch '123.09beta01'

centminmod · Mar 29, 2017 · de8d293 · de8d293
2 parents cced6ea + 5ff3773
commit de8d293
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 9 deletions.
diff --git a/centmin.sh b/centmin.sh
@@ -1197,7 +1197,7 @@ fi
 ################################################################
 # SCRIPT START
 #
-clear
+# clear
 cecho "**********************************************************************" $boldyellow
 cecho "* Centmin Mod Nginx, MariaDB MySQL, PHP & DNS Install script for CentOS" $boldgreen
 cecho "* Version: $SCRIPT_VERSION - Date: $SCRIPT_DATE" $boldgreen

diff --git a/inc/apcinstall.inc b/inc/apcinstall.inc
@@ -13,7 +13,7 @@ function funct_apcsourceinstall {
     echo "*************************************************"
 
         if [[ "$CLANG_APC" = [yY] ]]; then
-            if [[ ! -f /usr/bin/clang ]]; then
+            if [[ "$CENTOS_SIX" = '6' && ! -f /usr/bin/clang ]] || [[ "$CENTOS_SEVEN" = '7' && ! -f /bin/clang ]]; then
                 yum -q -y install clang clang-devel
             fi
             export CC="ccache /usr/bin/clang -ferror-limit=0"

diff --git a/inc/downloads.inc b/inc/downloads.inc
@@ -564,7 +564,7 @@ libresslgeolocation() {
       curl -sI --connect-timeout 5 --max-time 5 "$LIBRESSL_LINK" | grep 'HTTP\/' | grep '200'
       LIBRESSL_CURLCHECK=$?
       if [[ "$LIBRESSL_CURLCHECK" != '0' ]]; then
-        LIBRESSL_MIRRORURL="http://openbsd.mirrors.pair.com/LibreSSL"
+        LIBRESSL_MIRRORURL="http://mirrors.mit.edu/pub/OpenBSD/LibreSSL"
         LIBRESSL_LINK="${LIBRESSL_MIRRORURL}/libressl-${LIBRESSL_VERSION}.tar.gz"
         curl -sI --connect-timeout 5 --max-time 5 "$LIBRESSL_LINK" | grep 'HTTP\/' | grep '200'
         LIBRESSL_CURLCHECK=$?
@@ -613,7 +613,7 @@ libresslgeolocation() {
       curl -sI --connect-timeout 5 --max-time 5 "$LIBRESSL_LINK" | grep 'HTTP\/' | grep '200'
       LIBRESSL_CURLCHECK=$?
       if [[ "$LIBRESSL_CURLCHECK" != '0' ]]; then
-        LIBRESSL_MIRRORURL="http://openbsd.mirrors.pair.com/LibreSSL"
+        LIBRESSL_MIRRORURL="http://mirrors.mit.edu/pub/OpenBSD/LibreSSL"
         LIBRESSL_LINK="${LIBRESSL_MIRRORURL}/libressl-${LIBRESSL_VERSION}.tar.gz"
         curl -sI --connect-timeout 5 --max-time 5 "$LIBRESSL_LINK" | grep 'HTTP\/' | grep '200'
         LIBRESSL_CURLCHECK=$?

diff --git a/inc/memcached_install.inc b/inc/memcached_install.inc
@@ -87,7 +87,7 @@ checkigbinary() {
 function funct_memcachedreinstall {
 
         if [[ "$CLANG_MEMCACHED" = [yY] ]]; then
-            if [[ ! -f /usr/bin/clang ]]; then
+            if [[ "$CENTOS_SIX" = '6' && ! -f /usr/bin/clang ]] || [[ "$CENTOS_SEVEN" = '7' && ! -f /bin/clang ]]; then
                 yum -q -y install clang clang-devel
             fi
             # ccache compiler has some initial overhead for compiles but speeds up subsequent

diff --git a/inc/nginx_configure.inc b/inc/nginx_configure.inc
@@ -2014,7 +2014,7 @@ fi
 ngxgeoipmemtweak
 
 if [[ "$CLANG" = [yY] ]]; then
-	if [[ ! -f /usr/bin/clang ]]; then
+	if [[ "$CENTOS_SIX" = '6' && ! -f /usr/bin/clang ]] || [[ "$CENTOS_SEVEN" = '7' && ! -f /bin/clang ]]; then
 		yum -q -y install clang clang-devel
 	fi
 	if [[ ! -f /opt/rh/devtoolset-4/root/usr/bin/gcc || ! -f /opt/rh/devtoolset-4/root/usr/bin/g++ ]] || [[ ! -f /opt/rh/devtoolset-6/root/usr/bin/gcc || ! -f /opt/rh/devtoolset-6/root/usr/bin/g++ ]]; then

diff --git a/inc/openssl_install.inc b/inc/openssl_install.inc
@@ -221,7 +221,7 @@ installopenssl() {
             bash autogen.sh
         fi
         if [[ "$CLANG" = [yY] ]]; then
-            if [[ ! -f /usr/bin/clang ]]; then
+            if [[ "$CENTOS_SIX" = '6' && ! -f /usr/bin/clang ]] || [[ "$CENTOS_SEVEN" = '7' && ! -f /bin/clang ]]; then
                 yum -q -y install clang clang-devel
             fi
             # ccache compiler has some initial overhead for compiles but speeds up subsequent

diff --git a/inc/php_configure.inc b/inc/php_configure.inc
@@ -295,7 +295,7 @@ if [[ "$(grep -c "processor" /proc/cpuinfo)" -lt '2' ]]; then
 fi
 
 if [[ "$CLANG_PHP" = [yY] ]]; then
-    if [[ ! -f /usr/bin/clang ]]; then
+    if [[ "$CENTOS_SIX" = '6' && ! -f /usr/bin/clang ]] || [[ "$CENTOS_SEVEN" = '7' && ! -f /bin/clang ]]; then
         yum -q -y install clang clang-devel
     fi
     if [[ "$GCCINTEL_PHP" = [yY] ]]; then

diff --git a/inc/yuminstall.inc b/inc/yuminstall.inc
@@ -266,7 +266,8 @@ fi
 # remove /tmp/curlinstaller-yum
 rm -rf /tmp/curlinstaller-yum
 
-yum -y update
+# duplicate
+# yum -y update
 
 } 2>&1 | tee ${CENTMINLOGDIR}/centminmod_yumtimes_${DT}.log