From 8181a0d16f1baed75f962308c9c237ffaf1a8505 Mon Sep 17 00:00:00 2001 From: midoks Date: Sun, 17 Jul 2022 16:00:59 +0800 Subject: [PATCH 1/8] Update tools.py --- tools.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools.py b/tools.py index f67b28575..014192843 100755 --- a/tools.py +++ b/tools.py @@ -64,7 +64,7 @@ if __name__ == "__main__": if type == 'panel': set_panel_pwd(sys.argv[2]) elif type == 'username': - set_panel_username() + set_panel_username(sys.argv[2]) elif type == 'getServerIp': getServerIp() else: From 807d1130250a4c630206349ec828bcb486833cf1 Mon Sep 17 00:00:00 2001 From: midoks Date: Sun, 17 Jul 2022 16:02:35 +0800 Subject: [PATCH 2/8] Update tools.py --- tools.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tools.py b/tools.py index 014192843..394bce34c 100755 --- a/tools.py +++ b/tools.py @@ -64,7 +64,10 @@ if __name__ == "__main__": if type == 'panel': set_panel_pwd(sys.argv[2]) elif type == 'username': - set_panel_username(sys.argv[2]) + if len(sys.argv) == 2: + set_panel_username(sys.argv[2]) + else: + set_panel_username() elif type == 'getServerIp': getServerIp() else: From ec3847a7f23604de96a1b3e7dc88cff03bd8c764 Mon Sep 17 00:00:00 2001 From: midoks Date: Sun, 17 Jul 2022 16:05:05 +0800 Subject: [PATCH 3/8] Update tools.py --- tools.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools.py b/tools.py index 394bce34c..bf4e22dd8 100755 --- a/tools.py +++ b/tools.py @@ -64,7 +64,7 @@ if __name__ == "__main__": if type == 'panel': set_panel_pwd(sys.argv[2]) elif type == 'username': - if len(sys.argv) == 2: + if len(sys.argv) > 2: set_panel_username(sys.argv[2]) else: set_panel_username() From b0869c98b14d72b2f900bd030fab9e7eda02673c Mon Sep 17 00:00:00 2001 From: midoks Date: Sun, 17 Jul 2022 16:46:35 +0800 Subject: [PATCH 4/8] Update gd_old.sh --- plugins/php/versions/common/gd_old.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/php/versions/common/gd_old.sh b/plugins/php/versions/common/gd_old.sh index 1f1c35682..40a13fcd8 100755 --- a/plugins/php/versions/common/gd_old.sh +++ b/plugins/php/versions/common/gd_old.sh @@ -55,7 +55,7 @@ Install_lib() return fi - # cd $serverPath/mdserver-web/plugins/php/lib && /bin/bash freetype_old.sh + cd $serverPath/mdserver-web/plugins/php/lib && /bin/bash freetype_old.sh if [ ! -f "$extFile" ];then @@ -73,7 +73,7 @@ Install_lib() ./configure --with-php-config=$serverPath/php/$version/bin/php-config \ --with-gd \ --with-jpeg-dir \ - --with-freetype-dir \ + --with-freetype-dir=${serverPath}/lib/freetype_old \ --enable-gd-jis-conv \ --enable-gd-native-ttf make clean && make && make install && make clean From bae9bbe3390d2fa68873aeb0bfe0bca9471c4ee1 Mon Sep 17 00:00:00 2001 From: midoks Date: Sun, 17 Jul 2022 17:03:47 +0800 Subject: [PATCH 5/8] Update gd_old.sh --- plugins/php/versions/common/gd_old.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/php/versions/common/gd_old.sh b/plugins/php/versions/common/gd_old.sh index 40a13fcd8..1016f205b 100755 --- a/plugins/php/versions/common/gd_old.sh +++ b/plugins/php/versions/common/gd_old.sh @@ -55,7 +55,7 @@ Install_lib() return fi - cd $serverPath/mdserver-web/plugins/php/lib && /bin/bash freetype_old.sh + # cd $serverPath/mdserver-web/plugins/php/lib && /bin/bash freetype_old.sh if [ ! -f "$extFile" ];then @@ -73,7 +73,7 @@ Install_lib() ./configure --with-php-config=$serverPath/php/$version/bin/php-config \ --with-gd \ --with-jpeg-dir \ - --with-freetype-dir=${serverPath}/lib/freetype_old \ + --with-freetype-dir=/usr/local \ --enable-gd-jis-conv \ --enable-gd-native-ttf make clean && make && make install && make clean From 913cb863c2922fadb58b637471c85d1824f8a92a Mon Sep 17 00:00:00 2001 From: midoks Date: Sun, 17 Jul 2022 17:19:19 +0800 Subject: [PATCH 6/8] Update gd_old.sh --- plugins/php/versions/common/gd_old.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/php/versions/common/gd_old.sh b/plugins/php/versions/common/gd_old.sh index 1016f205b..1f1c35682 100755 --- a/plugins/php/versions/common/gd_old.sh +++ b/plugins/php/versions/common/gd_old.sh @@ -73,7 +73,7 @@ Install_lib() ./configure --with-php-config=$serverPath/php/$version/bin/php-config \ --with-gd \ --with-jpeg-dir \ - --with-freetype-dir=/usr/local \ + --with-freetype-dir \ --enable-gd-jis-conv \ --enable-gd-native-ttf make clean && make && make install && make clean From f2789e92dfc97ab87aaa0eff7c24884f17307b2d Mon Sep 17 00:00:00 2001 From: midoks Date: Sun, 17 Jul 2022 17:27:57 +0800 Subject: [PATCH 7/8] up --- scripts/install/alma.sh | 21 +++++++++++++++++++++ scripts/install/fedora.sh | 26 +++++++++++++++++++++++--- scripts/lib.sh | 25 +++++-------------------- 3 files changed, 49 insertions(+), 23 deletions(-) diff --git a/scripts/install/alma.sh b/scripts/install/alma.sh index 714a61752..666fe09ed 100755 --- a/scripts/install/alma.sh +++ b/scripts/install/alma.sh @@ -84,6 +84,27 @@ dnf --enablerepo=crb install -y patchelf dnf install -y langpacks-zh_CN langpacks-en langpacks-en_GB + +yum install -y libtirpc libtirpc-devel +yum install -y rpcgen +yum install -y openldap openldap-devel +yum install -y bison re2c cmake +yum install -y cmake3 +yum install -y autoconf + +yum install -y curl curl-devel +yum install -y zlib zlib-devel +yum install -y libzip libzip-devel +yum install -y pcre pcre-devel +yum install -y icu libicu-devel +yum install -y freetype freetype-devel +yum install -y openssl openssl-devel +yum install -y graphviz libxml2 libxml2-devel +yum install -y sqlite-devel +yum install -y oniguruma oniguruma-devel +yum install -y ImageMagick ImageMagick-devel + + for yumPack in make cmake gcc gcc-c++ flex bison file libtool libtool-libs autoconf kernel-devel patch wget 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 libidn libidn-devel vim-minimal gettext gettext-devel ncurses-devel gmp-devel libcap diffutils ca-certificates net-tools 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 dnf --enablerepo=crb install -y $yumPack;done diff --git a/scripts/install/fedora.sh b/scripts/install/fedora.sh index 86eef8531..d977eef40 100644 --- a/scripts/install/fedora.sh +++ b/scripts/install/fedora.sh @@ -68,18 +68,38 @@ systemctl stop firewalld yum groupinstall -y "Development Tools" yum -y install epel-release -yum install -y libevent libevent-devel libxslt* libjpeg* libpng* gd* zip libmcrypt libmcrypt-devel +yum install -y libevent libevent-devel zip libmcrypt libmcrypt-devel yum install -y gcc libffi-devel python-devel openssl-devel yum install -y curl-devel libmcrypt libmcrypt-devel python3-devel -yum -y install wget python-devel python-imaging libicu-devel unzip bzip2-devel gcc libxml2 libxml2-devel libjpeg-devel libpng-devel libwebp libwebp-devel lsof pcre pcre-devel crontabs +yum -y install wget python-devel python-imaging libicu-devel unzip bzip2-devel gcc libxml2 libxml2-devel libjpeg-devel libpng-devel libwebp libwebp-devel pcre pcre-devel crontabs yum -y install net-tools yum -y install ncurses-devel mysql-devel cmake yum -y install python-devel yum -y install MySQL-python 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; +yum install -y libtirpc libtirpc-devel +yum install -y rpcgen +yum install -y openldap openldap-devel +yum install -y bison re2c cmake +yum install -y cmake3 +yum install -y autoconf + +yum install -y libmemcached libmemcached-devel +yum install -y curl curl-devel +yum install -y zlib zlib-devel +yum install -y libzip libzip-devel +yum install -y pcre pcre-devel +yum install -y icu libicu-devel +yum install -y freetype freetype-devel +yum install -y openssl openssl-devel +yum install -y graphviz libxml2 libxml2-devel +yum install -y sqlite-devel +yum install -y oniguruma oniguruma-devel +yum install -y ImageMagick ImageMagick-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 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 crontabs expat-devel readline-devel; do yum -y install $yumPack;done dnf install libxml2 libxml2-devel -y diff --git a/scripts/lib.sh b/scripts/lib.sh index 158a63777..19e558357 100755 --- a/scripts/lib.sh +++ b/scripts/lib.sh @@ -33,6 +33,10 @@ elif [ "$OSNAME" == "freebsd" ];then echo "freebsd lib" elif [ "$OSNAME" == "centos" ];then echo "centos lib" +elif [ "$OSNAME" == "fedora" ];then + echo "fedora lib" +elif [ "$OSNAME" == "alma" ];then + echo "alma lib" elif [ "$OSNAME" == "ubuntu" ] || [ "$OSNAME" == "debian" ]; then apt install -y devscripts @@ -93,26 +97,7 @@ elif [ "$OSNAME" == "ubuntu" ] || [ "$OSNAME" == "debian" ]; then apt install -y libmariadb-dev-compat #apt install -y libmariadbclient-dev else - - yum install -y libtirpc libtirpc-devel - yum install -y rpcgen - yum install -y openldap openldap-devel - yum install -y bison re2c cmake - yum install -y cmake3 - yum install -y autoconf - - yum install -y libmemcached libmemcached-devel - yum install -y curl curl-devel - yum install -y zlib zlib-devel - yum install -y libzip libzip-devel - yum install -y pcre pcre-devel - yum install -y icu libicu-devel - yum install -y freetype freetype-devel - yum install -y openssl openssl-devel - yum install -y graphviz libxml2 libxml2-devel - yum install -y sqlite-devel - yum install -y oniguruma oniguruma-devel - yum install -y ImageMagick ImageMagick-devel + echo "OK" fi From 1a8ea2dffe75dd51ba27948745f01a9ee1054e77 Mon Sep 17 00:00:00 2001 From: midoks Date: Sun, 17 Jul 2022 17:30:43 +0800 Subject: [PATCH 8/8] Update centos.sh --- scripts/install/centos.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/install/centos.sh b/scripts/install/centos.sh index 092014382..36a8e0c7a 100755 --- a/scripts/install/centos.sh +++ b/scripts/install/centos.sh @@ -84,13 +84,13 @@ if [ "$?" != "0" ];then fi - yum install -y libtirpc libtirpc-devel yum install -y rpcgen yum install -y openldap openldap-devel -yum install -y bison re2c cmake +yum install -y bison re2c yum install -y cmake3 yum install -y autoconf +yum install -y make cmake gcc gcc-c++ yum install -y libmemcached libmemcached-devel yum install -y curl curl-devel @@ -118,7 +118,7 @@ yum install -y ncurses-devel yum install -y vixie-cron -for yumPack in make cmake gcc gcc-c++ flex bison file libtool libtool-libs autoconf kernel-devel patch wget libjpeg libjpeg-devel libpng libpng-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 libidn libidn-devel vim-minimal gettext gettext-devel ncurses-devel gmp-devel libcap diffutils ca-certificates net-tools psmisc libXpm-devel git-core c-ares-devel libicu-devel libxslt libxslt-devel zip unzip glibc.i686 libstdc++.so.6 cairo-devel ncurses-devel libaio-devel perl perl-devel perl-Data-Dumper expat-devel readline-devel; +for yumPack in flex file libtool libtool-libs kernel-devel patch wget glib2 glib2-devel tar bzip2 bzip2-devel libevent libevent-devel ncurses ncurses-devel curl curl-devel libcurl libcurl-devel e2fsprogs e2fsprogs-devel libidn libidn-devel vim-minimal gettext gettext-devel ncurses-devel gmp-devel libcap diffutils ca-certificates net-tools psmisc libXpm-devel git-core c-ares-devel libicu-devel libxslt libxslt-devel zip unzip glibc.i686 libstdc++.so.6 cairo-devel ncurses-devel libaio-devel perl perl-devel perl-Data-Dumper expat-devel readline-devel; do yum -y install $yumPack;done