From 6de53d16a630ef5f348bd81ebb96d9e1dbb7d7c1 Mon Sep 17 00:00:00 2001 From: midoks Date: Thu, 14 Jul 2022 23:51:19 +0800 Subject: [PATCH] up --- scripts/install/fedora.sh | 2 ++ scripts/install/rocky.sh | 3 +-- scripts/lib.sh | 5 ----- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/scripts/install/fedora.sh b/scripts/install/fedora.sh index 4ab4c71f3..86eef8531 100644 --- a/scripts/install/fedora.sh +++ b/scripts/install/fedora.sh @@ -82,6 +82,8 @@ yum -y install python3-devel for yumPack in make cmake gcc gcc-c++ gcc-g77 flex bison file libtool libtool-libs autoconf kernel-devel patch wget libjpeg libjpeg-devel libpng libpng-devel libpng10 libpng10-devel gd gd-devel libxml2 libxml2-devel zlib zlib-devel glib2 glib2-devel tar bzip2 bzip2-devel libevent libevent-devel ncurses ncurses-devel curl curl-devel libcurl libcurl-devel e2fsprogs e2fsprogs-devel krb5 krb5-devel libidn libidn-devel vim-minimal gettext gettext-devel ncurses-devel gmp-devel pspell-devel libcap diffutils ca-certificates net-tools libc-client-devel psmisc libXpm-devel git-core c-ares-devel libicu-devel libxslt libxslt-devel zip unzip glibc.i686 libstdc++.so.6 cairo-devel bison-devel ncurses-devel libaio-devel perl perl-devel perl-Data-Dumper lsof vixie-cron crontabs expat-devel readline-devel; do yum -y install $yumPack;done +dnf install libxml2 libxml2-devel -y + cd /www/server/mdserver-web/scripts && bash lib.sh chmod 755 /www/server/mdserver-web/data diff --git a/scripts/install/rocky.sh b/scripts/install/rocky.sh index e6152c4b7..5d3ea7a93 100644 --- a/scripts/install/rocky.sh +++ b/scripts/install/rocky.sh @@ -77,14 +77,13 @@ yum install -y ncurses-devel mysql-devel cmake yum install -y MySQL-python for yumPack in make cmake gcc gcc-c++ gcc-g77 flex bison file libtool libtool-libs autoconf kernel-devel patch wget libjpeg libjpeg-devel libpng libpng-devel libpng10 libpng10-devel gd gd-devel libxml2 libxml2-devel zlib zlib-devel glib2 glib2-devel tar bzip2 bzip2-devel libevent libevent-devel ncurses ncurses-devel curl curl-devel libcurl libcurl-devel e2fsprogs e2fsprogs-devel krb5 krb5-devel libidn libidn-devel vim-minimal gettext gettext-devel ncurses-devel gmp-devel pspell-devel libcap diffutils ca-certificates net-tools libc-client-devel psmisc libXpm-devel git-core c-ares-devel libicu-devel libxslt libxslt-devel zip unzip glibc.i686 libstdc++.so.6 cairo-devel bison-devel ncurses-devel libaio-devel perl perl-devel perl-Data-Dumper lsof crontabs expat-devel readline-devel; -do yum -y install $yumPack;done +do dnf --enablerepo=powertools install -y $yumPack;done yum install -y libtirpc libtirpc-devel dnf --enablerepo=powertools install -y libmemcached libmemcached-devel dnf --enablerepo=powertools install -y rpcgen dnf --enablerepo=powertools install -y oniguruma oniguruma-devel - dnf --enablerepo=powertools install -y re2c bison cd /www/server/mdserver-web/scripts && bash lib.sh diff --git a/scripts/lib.sh b/scripts/lib.sh index 55dd284d9..2ddedb25d 100755 --- a/scripts/lib.sh +++ b/scripts/lib.sh @@ -109,11 +109,6 @@ else yum install -y mysql-devel yum install -y oniguruma oniguruma-devel yum install -y ImageMagick ImageMagick-devel - - if [ "$OSNAME" == "fedora" ]; then - dnf install libxml2 libxml2-devel -y - - fi fi