update centmin.sh menu option 4, 5 and 15 routine in 123.09beta01

- existing users can run cmupdate command to update their local code - centmin.sh menu option 4 and 5's yum check prompt has now been disabled as generally not needed so to prevent issues with future yum package conflicts, disabled by default. However, the yum check routine has been updated to prevent CentOS 7 ImageMagick7 and ImageMagick Remi yum conflicts as well. - centmin.sh menu option 15 imagemagick routine has been updated to disable base yum repo for CentOS 7 so Remi YUM version doesn't conflict with CentOS 7 base ImageMagick
centminmod · Aug 11, 2020 · 43e920f · 43e920f
1 parent 1a29258
commit 43e920f
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 10 deletions.
diff --git a/centmin.sh b/centmin.sh
@@ -27,7 +27,7 @@ DT=$(date +"%d%m%y-%H%M%S")
 branchname='123.09beta01'
 SCRIPT_MAJORVER='1.2.3'
 SCRIPT_MINORVER='09'
-SCRIPT_INCREMENTVER='555'
+SCRIPT_INCREMENTVER='556'
 SCRIPT_VERSIONSHORT="${branchname}"
 SCRIPT_VERSION="${SCRIPT_VERSIONSHORT}.b${SCRIPT_INCREMENTVER}"
 SCRIPT_DATE='31/07/2020'
@@ -2922,7 +2922,7 @@ EOF
         ccacheinstall
         fi
 
-        yumskipinstall
+        #yumskipinstall
         if [[ "$yuminstallrun" == [yY] ]]; then
         yuminstall
         fi
@@ -2963,7 +2963,7 @@ EOF
         ccacheinstall
         fi
 
-        yumskipinstall
+        #yumskipinstall
         if [[ "$yuminstallrun" == [yY] ]]; then
         yuminstall
         fi
@@ -3505,7 +3505,7 @@ EOF
         UALL='y'
         cecho "Updating Nginx, PHP-FPM & Siege versions" $boldyellow
         echo
-        yumskipinstall
+        #yumskipinstall
 
         if [[ "$yuminstallrun" == [yY] ]]; then
             yuminstall

diff --git a/inc/imagick_install.inc b/inc/imagick_install.inc
@@ -139,8 +139,8 @@ checkimagicksys() {
                             yum -y swap libwebp-devel libwebp7-devel --enablerepo=remi
                             time $YUMDNFBIN -y install ImageMagick-devel ImageMagick-c++-devel --enablerepo=remi${DISABLEREPO_DNF} --disableplugin=priorities${VERSIONLOCK_REPO}
                         fi
-                        echo "$YUMDNFBIN -y update ImageMagick ImageMagick-devel ImageMagick-c++ ImageMagick-c++-devel ImageMagick-libs${IMG_HEIFOPT} LibRaw --enablerepo=remi${DISABLEREPO_DNF} --disableplugin=priorities${VERSIONLOCK_REPO} -x ImageMagick7*"
-                        time $YUMDNFBIN -y update ImageMagick ImageMagick-devel ImageMagick-c++ ImageMagick-c++-devel ImageMagick-libs${IMG_HEIFOPT} LibRaw --enablerepo=remi${DISABLEREPO_DNF} --disableplugin=priorities${VERSIONLOCK_REPO} -x ImageMagick7*
+                        echo "$YUMDNFBIN -y update ImageMagick ImageMagick-devel ImageMagick-c++ ImageMagick-c++-devel ImageMagick-libs${IMG_HEIFOPT} LibRaw --enablerepo=remi${DISABLEREPO_DNF} --disableplugin=priorities${VERSIONLOCK_REPO} -x ImageMagick7* --disablerepo=base"
+                        time $YUMDNFBIN -y update ImageMagick ImageMagick-devel ImageMagick-c++ ImageMagick-c++-devel ImageMagick-libs${IMG_HEIFOPT} LibRaw --enablerepo=remi${DISABLEREPO_DNF} --disableplugin=priorities${VERSIONLOCK_REPO} -x ImageMagick7* --disablerepo=base
                         sar_call
                     fi
                 else

diff --git a/inc/yuminstall.inc b/inc/yuminstall.inc
@@ -276,9 +276,18 @@ if [[ "$REMIREPO_DISABLE" = [nN] &&  "$(uname -m)" != 'aarch64' ]]; then
         ${YUMDNFBIN} -y install lcms2-devel libwebp libwebp-devel OpenEXR-devel ilmbase-devel libGLU-devel libGL-devel mesa-libGL mesa-libGL-devel libXxf86vm libXxf86vm-devel --enablerepo=remi${DISABLEREPO_DNF}
       fi
       sar_call
-
-      ${YUMDNFBIN} -y remove ImageMagick${DISABLEREPO_DNF}
+
+      if [[ "$CENTOS_SIX" = '6' ]]; then
+        # only applies to CentOS 6 and CentOS 7 remi ImageMagick yum package has been renamed from ImageMagick6 to ImageMagick
+        ${YUMDNFBIN} -y remove ImageMagick${DISABLEREPO_DNF}
+      fi
       sar_call
+
+      if [ -f /etc/yum/pluginconf.d/versionlock.conf ]; then
+          VERSIONLOCK_REPO=',versionlock'
+      else
+          VERSIONLOCK_REPO=""
+      fi
 
       if [[ "$CENTOS_SIX" = '6' ]]; then
         # ${YUMDNFBIN} -y install libwebp libwebp-devel --skip-broken
@@ -288,7 +297,8 @@ if [[ "$REMIREPO_DISABLE" = [nN] &&  "$(uname -m)" != 'aarch64' ]]; then
         if [[ "$(rpm -qa libwebp-devel)" ]]; then
             yum -y swap libwebp-devel libwebp7-devel --enablerepo=remi
         fi
-        ${YUMDNFBIN} -y install ImageMagick ImageMagick-devel ImageMagick-c++ ImageMagick-c++-devel --enablerepo=remi --disableplugin=priorities${DISABLEREPO_DNF}
+        # disable base as CentOS 7.8+ has ImageMagick packages of their own which may conflict with Remi's ImageMagick versions
+        ${YUMDNFBIN} -y install ImageMagick ImageMagick-devel ImageMagick-c++ ImageMagick-c++-devel --enablerepo=remi --disableplugin=priorities${VERSIONLOCK_REPO}${DISABLEREPO_DNF} --disablerepo=base
         sar_call
       fi
 
@@ -301,7 +311,11 @@ if [[ "$REMIREPO_DISABLE" = [nN] &&  "$(uname -m)" != 'aarch64' ]]; then
             yum -y swap libwebp-devel libwebp7-devel --enablerepo=remi
         fi
       fi
-      ${YUMDNFBIN} -y update ImageMagick${REMI_IMAGEMAGICK_PKGNAME} ImageMagick${REMI_IMAGEMAGICK_PKGNAME}-devel ImageMagick${REMI_IMAGEMAGICK_PKGNAME}-c++ ImageMagick${REMI_IMAGEMAGICK_PKGNAME}-c++-devel --enablerepo=remi --disableplugin=priorities${DISABLEREPO_DNF}
+      if [[ "$CENTOS_SEVEN" = '7' ]]; then
+        ${YUMDNFBIN} -y update ImageMagick${REMI_IMAGEMAGICK_PKGNAME} ImageMagick${REMI_IMAGEMAGICK_PKGNAME}-devel ImageMagick${REMI_IMAGEMAGICK_PKGNAME}-c++ ImageMagick${REMI_IMAGEMAGICK_PKGNAME}-c++-devel --enablerepo=remi --disableplugin=priorities${VERSIONLOCK_REPO}${DISABLEREPO_DNF} --disablerepo=base
+      else
+        ${YUMDNFBIN} -y update ImageMagick${REMI_IMAGEMAGICK_PKGNAME} ImageMagick${REMI_IMAGEMAGICK_PKGNAME}-devel ImageMagick${REMI_IMAGEMAGICK_PKGNAME}-c++ ImageMagick${REMI_IMAGEMAGICK_PKGNAME}-c++-devel --enablerepo=remi --disableplugin=priorities${VERSIONLOCK_REPO}${DISABLEREPO_DNF}
+      fi
       sar_call
     fi
   fi