Merge pull request #133 from magenx/dev

cleanup
magenx · Dec 2, 2022 · bc651a9 · bc651a9
2 parents 4524aa9 + ab3260e
commit bc651a9
Showing 1 changed file with 8 additions and 7 deletions.
diff --git a/magenx.install.latest.sh b/magenx.install.latest.sh
@@ -39,17 +39,17 @@ REMI_RPM_REPO="http://rpms.famillecollet.com/enterprise/remi-release-8.rpm"
 
 # WebStack Packages .deb
 EXTRA_PACKAGES_DEB="curl jq gnupg2 auditd apt-transport-https apt-show-versions ca-certificates lsb-release make autoconf snapd automake libtool uuid-runtime \
-perl openssl unzip recode ed screen inotify-tools iptables smartmontools clamav mlocate vim wget sudo bc apache2-utils \
+perl openssl unzip recode ed screen inotify-tools iptables smartmontools clamav mlocate vim wget sudo apache2-utils \
 logrotate git netcat patch ipset postfix strace rsyslog geoipupdate moreutils lsof sysstat acl attr iotop expect imagemagick snmp"
 PERL_MODULES_DEB="liblwp-protocol-https-perl libdbi-perl libconfig-inifiles-perl libdbd-mysql-perl libterm-readkey-perl"
 PHP_PACKAGES_DEB=(cli fpm common mysql zip lz4 gd mbstring curl xml bcmath intl ldap soap oauth apcu)
 
 # WebStack Packages .rpm
 EXTRA_PACKAGES_RPM="autoconf snapd jq automake libtidy libpcap gettext-devel recode gflags tbb ed lz4 libyaml libdwarf \
-bind-utils screen gcc iptraf inotify-tools iptables smartmontools net-tools mlocate unzip vim wget curl sudo bc mailx clamav-filesystem clamav-server \
+bind-utils screen gcc iptraf inotify-tools iptables smartmontools net-tools mlocate unzip vim wget sudo mailx clamav-filesystem clamav-server \
 clamav-update clamav-milter-systemd clamav-data clamav-server-systemd clamav-scanner-systemd clamav clamav-milter clamav-lib logrotate git patch ipset strace rsyslog \
 ncurses-devel GeoIP GeoIP-devel geoipupdate openssl-devel ImageMagick moreutils lsof net-snmp net-snmp-utils ncftp postfix augeas-libs libffi-devel \
-mod_ssl dnf-automatic sysstat libuuid-devel uuid-devel acl attr iotop expect unixODBC gcc-c++"
+mod_ssl sysstat libuuid-devel uuid-devel acl attr iotop expect unixODBC gcc-c++"
 PHP_PACKAGES_RPM=(cli common fpm opcache gd curl mbstring bcmath soap mcrypt mysqlnd pdo xml xmlrpc intl gmp phpseclib recode \
 tcpdf tcpdf-dejavu-sans-fonts tidy snappy ldap lz4) 
 PHP_PECL_PACKAGES_RPM=(pecl-redis pecl-lzf pecl-geoip pecl-zip pecl-memcache pecl-oauth pecl-apcu)
@@ -215,7 +215,7 @@ if [[ ${RESULT} == up ]]; then
   exit 1
 fi
 
-## Ubuntu Debian RedHat CentOS Amazon
+## Ubuntu Debian RedHat Rocky Amazon
 ## Distro detect and set installation key
 distro_error ()
 {
@@ -271,11 +271,11 @@ if [ -f "${MAGENX_CONFIG_PATH}/distro" ]; then
   fi
 fi
 
-# check if memory is enough
+# install packages to run CPU and HDD test
 if [[ "${OS_DISTRO_KEY}" =~ (redhat|amazon) ]]; then
   rpm --quiet -q dnf || yum install -y 'dnf*' yum-utils
   rpm --quiet -q epel-release || dnf -y install epel-release
-  rpm --quiet -q curl time bc bzip2 tar || dnf -y install time bc bzip2 tar
+  rpm --quiet -q curl time bc bzip2 tar || dnf -y install curl time bc bzip2 tar
   rpm --quiet -q langpacks-en glibc-all-langpacks || dnf -y install langpacks-en glibc-all-langpacks
  else
   dpkg-query -l curl time bc bzip2 tar >/dev/null || { apt update -o Acquire::ForceIPv4=true; apt -y install curl time bc bzip2 tar; }
@@ -308,7 +308,8 @@ MD5=$(md5sum ${SELF} | awk '{print $1}')
    echo
   fi
 fi
-
+
+# check if memory is enough
 TOTALMEM=$(awk '/MemTotal/{print $2}' /proc/meminfo | xargs -I {} echo "scale=4; {}/1024^2" | bc | xargs printf "%1.0f")
 if [ "${TOTALMEM}" -ge "4" ]; then
   GREENTXT "PASS: YOU HAVE ${TOTALMEM} Gb OF RAM"