diff --git a/scripts/install/debian.sh b/scripts/install/debian.sh index dd8f77aeb..04de80a87 100644 --- a/scripts/install/debian.sh +++ b/scripts/install/debian.sh @@ -123,15 +123,55 @@ if [ "$DISTRO" == 'debian' ]; then fi fi -apt install -y build-essential devscripts - -apt install --ignore-missing -y autoconf automake cmake curl dia gcc imagemagick libbz2-dev libcurl4-gnutls-dev\ - libcurl4-openssl-dev libevent-dev libffi-dev libfreetype6 libfreetype6-dev libgmp-dev libgmp3-dev libicu-dev \ - libjpeg-dev libjpeg62-turbo-dev libldap2-dev libmagickwand-dev libmcrypt-dev libmemcached-dev libncurses5-dev \ - libpcre3 libpcre3-dev libpng-dev libpspell-dev libreadline-dev librecode-dev libsasl2-dev libssl-dev \ - libunwind-dev libwebp-dev libxml2 libxml2-dev libxpm-dev libzip-dev lzma lzma-dev make net-tools openssl \ - pkg-config python3-dev scons webp zlib1g-dev - +apt install -y build-essential +apt install -y devscripts + +apt install -y net-tools +apt install -y autoconf +apt install -y gcc + +apt install -y libffi-dev +apt install -y cmake automake make + +apt install -y webp scons +apt install -y libwebp-dev +apt install -y lzma lzma-dev +apt install -y libunwind-dev + +apt install -y libpcre3 libpcre3-dev +apt install -y openssl +apt install -y libssl-dev + +apt install -y libmemcached-dev +apt install -y libsasl2-dev +apt install -y imagemagick +apt install -y libmagickwand-dev + +apt install -y libxml2 libxml2-dev libbz2-dev libmcrypt-dev libpspell-dev librecode-dev +apt install -y libgmp-dev libgmp3-dev libreadline-dev libxpm-dev +apt install -y dia pkg-config +apt install -y zlib1g-dev +apt install -y libjpeg-dev libpng-dev +apt install -y libfreetype6 +apt install -y libfreetype6-dev +apt install -y libevent-dev libncurses5-dev libldap2-dev +apt install -y libzip-dev +apt install -y libicu-dev + +apt install -y libcurl4-openssl-dev +apt install -y curl libcurl4-gnutls-dev + +# Disabled due to dependency issues +#apt install --ignore-missing -y autoconf automake cmake curl dia gcc imagemagick libbz2-dev libcurl4-gnutls-dev\ +# libcurl4-openssl-dev libevent-dev libffi-dev libfreetype6 libfreetype6-dev libgmp-dev libgmp3-dev libicu-dev \ +# libjpeg-dev libldap2-dev libmagickwand-dev libmcrypt-dev libmemcached-dev libncurses5-dev \ +# libpcre3 libpcre3-dev libpng-dev libpspell-dev libreadline-dev librecode-dev libsasl2-dev libssl-dev \ +# libunwind-dev libwebp-dev libxml2 libxml2-dev libxpm-dev libzip-dev lzma lzma-dev make net-tools openssl \ +# pkg-config python3-dev scons webp zlib1g-dev + +if [ "$DISTRO" == 'debian' ] && [ "$VERSION_ID" != "9" ]; then + apt install -y libjpeg62-turbo-dev +fi #https://blog.csdn.net/qq_36228377/article/details/123154344 # ln -s /usr/include/x86_64-linux-gnu/curl /usr/include/curl @@ -139,7 +179,6 @@ if [ ! -d /usr/include/curl ];then ln -s /usr/include/x86_64-linux-gnu/curl /usr/include/curl fi - apt install -y graphviz bison re2c flex libsqlite3-dev libonig-dev perl g++ libtool libxslt1-dev apt install -y libmariadb-dev libmariadb-dev-compat @@ -156,7 +195,5 @@ cd /www/server/mdserver-web/scripts && bash lib.sh chmod 755 /www/server/mdserver-web/data if [ "$DISTRO" == 'ubuntu' ] && [ "${VERSION_ID}" == "22.04" ]; then - apt install -y patchelf - apt install -y python3-cffi pip3 install -U --force-reinstall --no-binary :all: gevent fi \ No newline at end of file diff --git a/scripts/lib.sh b/scripts/lib.sh index faadf7eba..88f616d55 100755 --- a/scripts/lib.sh +++ b/scripts/lib.sh @@ -59,7 +59,7 @@ if [ ! -f /usr/local/bin/pip3 ] && [ ! -f /usr/bin/pip3 ];then fi which pip && pip install --upgrade pip -i $PIPSRC -pip3 install --upgrade setuptools -i $PIPSRC +pip3 install --upgrade pip setuptools wheel -i $PIPSRC cd /www/server/mdserver-web && pip3 install -r /www/server/mdserver-web/requirements.txt -i $PIPSRC # pip3 install flask-caching==1.10.1