From 49832ebf68bfa340719483296fd59c8be613afed Mon Sep 17 00:00:00 2001 From: Edi Septriyanto Date: Sat, 18 Dec 2021 16:12:05 +0700 Subject: [PATCH] Update wget --- lib/lemper-create.sh | 8 ++++---- scripts/bench.sh | 28 ++++++++++++++-------------- scripts/build_nginx.sh | 4 ++-- scripts/install_fail2ban.sh | 2 +- scripts/install_imagemagick.sh | 2 +- scripts/install_memcached.sh | 2 +- scripts/install_php.sh | 12 +++++++----- scripts/install_redis.sh | 2 +- scripts/install_tools.sh | 16 ++++++++-------- scripts/install_vsftpd.sh | 2 +- scripts/secure_server.sh | 2 +- 11 files changed, 41 insertions(+), 39 deletions(-) diff --git a/lib/lemper-create.sh b/lib/lemper-create.sh index e7938e1..031e97b 100755 --- a/lib/lemper-create.sh +++ b/lib/lemper-create.sh @@ -898,8 +898,8 @@ function install_wordpress() { if [ ! -f "${WEBROOT}/wp-includes/class-wp.php" ]; then if ! command -v wp-cli &> /dev/null; then info "WP CLI command not found, trying to install it first." - run wget https://raw.githubusercontent.com/wp-cli/builds/gh-pages/phar/wp-cli.phar \ - -O /usr/local/bin/wp-cli -q --show-progress && \ + run wget -q https://raw.githubusercontent.com/wp-cli/builds/gh-pages/phar/wp-cli.phar \ + -O /usr/local/bin/wp-cli && \ run chmod ugo+x /usr/local/bin/wp-cli fi @@ -1212,8 +1212,8 @@ function init_lemper_create() { echo "Downloading Drupal latest skeleton files..." if curl -sLI https://www.drupal.org/download-latest/zip | grep -q "HTTP/[.12]* [2].."; then - run wget https://www.drupal.org/download-latest/zip \ - -O "${TMPDIR}/drupal.zip" -q --show-progress && \ + run wget -q https://www.drupal.org/download-latest/zip \ + -O "${TMPDIR}/drupal.zip" && \ run unzip -q "${TMPDIR}/drupal.zip" -d "${TMPDIR}" && \ run rsync -rq ${TMPDIR}/drupal-*/ "${WEBROOT}" && \ run rm -f "${TMPDIR}/drupal.zip" && \ diff --git a/scripts/bench.sh b/scripts/bench.sh index 4ef756e..b42c843 100755 --- a/scripts/bench.sh +++ b/scripts/bench.sh @@ -29,33 +29,33 @@ echo "" # Network speed test benchmark. echo "### Network Speedtest Benchmark ###" -cachefly=$( wget -O /dev/null http://cachefly.cachefly.net/100mb.test 2>&1 | awk '/\/dev\/null/ {speed=$3 $4} END {gsub(/\(|\)/,"",speed); print speed}' ) +cachefly=$( wget -q -O /dev/null http://cachefly.cachefly.net/100mb.test 2>&1 | awk '/\/dev\/null/ {speed=$3 $4} END {gsub(/\(|\)/,"",speed); print speed}' ) echo "Download speed from CacheFly: $cachefly " -leaseweb=$( wget -O /dev/null http://mirror.leaseweb.com/speedtest/100mb.bin 2>&1 | awk '/\/dev\/null/ {speed=$3 $4} END {gsub(/\(|\)/,"",speed); print speed}' ) +leaseweb=$( wget -q -O /dev/null http://mirror.leaseweb.com/speedtest/100mb.bin 2>&1 | awk '/\/dev\/null/ {speed=$3 $4} END {gsub(/\(|\)/,"",speed); print speed}' ) echo "Download speed from Leaseweb, Haarlem, NL: $leaseweb " -linodeatl=$( wget -O /dev/null http://speedtest.atlanta.linode.com/100MB-atlanta.bin 2>&1 | awk '/\/dev\/null/ {speed=$3 $4} END {gsub(/\(|\)/,"",speed); print speed}' ) +linodeatl=$( wget -q -O /dev/null http://speedtest.atlanta.linode.com/100MB-atlanta.bin 2>&1 | awk '/\/dev\/null/ {speed=$3 $4} END {gsub(/\(|\)/,"",speed); print speed}' ) echo "Download speed from Linode, Atlanta, GA: $linodeatl " -linodedltx=$( wget -O /dev/null http://speedtest.dallas.linode.com/100MB-dallas.bin 2>&1 | awk '/\/dev\/null/ {speed=$3 $4} END {gsub(/\(|\)/,"",speed); print speed}' ) +linodedltx=$( wget -q -O /dev/null http://speedtest.dallas.linode.com/100MB-dallas.bin 2>&1 | awk '/\/dev\/null/ {speed=$3 $4} END {gsub(/\(|\)/,"",speed); print speed}' ) echo "Download speed from Linode, Dallas, TX: $linodedltx " -linodefmt=$( wget -O /dev/null http://speedtest.london.linode.com/100MB-london.bin 2>&1 | awk '/\/dev\/null/ {speed=$3 $4} END {gsub(/\(|\)/,"",speed); print speed}' ) +linodefmt=$( wget -q -O /dev/null http://speedtest.london.linode.com/100MB-london.bin 2>&1 | awk '/\/dev\/null/ {speed=$3 $4} END {gsub(/\(|\)/,"",speed); print speed}' ) echo "Download speed from Linode, Fremont, US: $linodefmt " -linodenj=$( wget -O /dev/null http://speedtest.newark.linode.com/100MB-newark.bin 2>&1 | awk '/\/dev\/null/ {speed=$3 $4} END {gsub(/\(|\)/,"",speed); print speed}' ) +linodenj=$( wget -q -O /dev/null http://speedtest.newark.linode.com/100MB-newark.bin 2>&1 | awk '/\/dev\/null/ {speed=$3 $4} END {gsub(/\(|\)/,"",speed); print speed}' ) echo "Download speed from Linode, Newark, NJ: $linodenj " -linodeuk=$( wget -O /dev/null http://speedtest.london.linode.com/100MB-london.bin 2>&1 | awk '/\/dev\/null/ {speed=$3 $4} END {gsub(/\(|\)/,"",speed); print speed}' ) +linodeuk=$( wget -q -O /dev/null http://speedtest.london.linode.com/100MB-london.bin 2>&1 | awk '/\/dev\/null/ {speed=$3 $4} END {gsub(/\(|\)/,"",speed); print speed}' ) echo "Download speed from Linode, London, UK: $linodeuk " -linodejp=$( wget -O /dev/null http://speedtest.tokyo.linode.com/100MB-tokyo.bin 2>&1 | awk '/\/dev\/null/ {speed=$3 $4} END {gsub(/\(|\)/,"",speed); print speed}' ) +linodejp=$( wget -q -O /dev/null http://speedtest.tokyo.linode.com/100MB-tokyo.bin 2>&1 | awk '/\/dev\/null/ {speed=$3 $4} END {gsub(/\(|\)/,"",speed); print speed}' ) echo "Download speed from Linode, Tokyo, JP: $linodejp " -linodesgp=$( wget -O /dev/null http://speedtest.singapore.linode.com/100MB-singapore.bin 2>&1 | awk '/\/dev\/null/ {speed=$3 $4} END {gsub(/\(|\)/,"",speed); print speed}' ) +linodesgp=$( wget -q -O /dev/null http://speedtest.singapore.linode.com/100MB-singapore.bin 2>&1 | awk '/\/dev\/null/ {speed=$3 $4} END {gsub(/\(|\)/,"",speed); print speed}' ) echo "Download speed from Linode, Singapore, SGP: $linodesgp " -slsea=$( wget -O /dev/null http://speedtest.sea01.softlayer.com/downloads/test100.zip 2>&1 | awk '/\/dev\/null/ {speed=$3 $4} END {gsub(/\(|\)/,"",speed); print speed}' ) +slsea=$( wget -q -O /dev/null http://speedtest.sea01.softlayer.com/downloads/test100.zip 2>&1 | awk '/\/dev\/null/ {speed=$3 $4} END {gsub(/\(|\)/,"",speed); print speed}' ) echo "Download speed from Softlayer, Seattle, WA: $slsea " -slsjc=$( wget -O /dev/null http://speedtest.sjc01.softlayer.com/downloads/test100.zip 2>&1 | awk '/\/dev\/null/ {speed=$3 $4} END {gsub(/\(|\)/,"",speed); print speed}' ) +slsjc=$( wget -q -O /dev/null http://speedtest.sjc01.softlayer.com/downloads/test100.zip 2>&1 | awk '/\/dev\/null/ {speed=$3 $4} END {gsub(/\(|\)/,"",speed); print speed}' ) echo "Download speed from Softlayer, San Jose, CA: $slsjc " -sldal=$( wget -O /dev/null http://speedtest.dal05.softlayer.com/downloads/test100.zip 2>&1 | awk '/\/dev\/null/ {speed=$3 $4} END {gsub(/\(|\)/,"",speed); print speed}' ) +sldal=$( wget -q -O /dev/null http://speedtest.dal05.softlayer.com/downloads/test100.zip 2>&1 | awk '/\/dev\/null/ {speed=$3 $4} END {gsub(/\(|\)/,"",speed); print speed}' ) echo "Download speed from Softlayer, Dallas, TX: $sldal " -slwdc=$( wget -O /dev/null http://speedtest.wdc01.softlayer.com/downloads/test100.zip 2>&1 | awk '/\/dev\/null/ {speed=$3 $4} END {gsub(/\(|\)/,"",speed); print speed}' ) +slwdc=$( wget -q -O /dev/null http://speedtest.wdc01.softlayer.com/downloads/test100.zip 2>&1 | awk '/\/dev\/null/ {speed=$3 $4} END {gsub(/\(|\)/,"",speed); print speed}' ) echo "Download speed from Softlayer, Washington, DC: $slwdc " -slsng=$( wget -O /dev/null http://speedtest.sng01.softlayer.com/downloads/test100.zip 2>&1 | awk '/\/dev\/null/ {speed=$3 $4} END {gsub(/\(|\)/,"",speed); print speed}' ) +slsng=$( wget -q -O /dev/null http://speedtest.sng01.softlayer.com/downloads/test100.zip 2>&1 | awk '/\/dev\/null/ {speed=$3 $4} END {gsub(/\(|\)/,"",speed); print speed}' ) echo "Download speed from Softlayer, Singapore: $slsng " diff --git a/scripts/build_nginx.sh b/scripts/build_nginx.sh index 0eca903..a0f3cb5 100755 --- a/scripts/build_nginx.sh +++ b/scripts/build_nginx.sh @@ -536,7 +536,7 @@ add support for dynamic modules in a way compatible with ngx_pagespeed until 1.9 status "Detected debian-based distro." install_dependencies "apt install ${INSTALL_FLAGS}" debian_is_installed \ - build-essential zlib1g-dev libpcre3 libpcre3-dev unzip wget uuid-dev + build-essential zlib1g-dev libpcre3 libpcre3-dev unzip wget -q uuid-dev if gcc_too_old; then if [ ! -e /usr/lib/gcc-mozilla/bin/gcc ]; then @@ -554,7 +554,7 @@ add support for dynamic modules in a way compatible with ngx_pagespeed until 1.9 status "Detected redhat-based distro." install_dependencies "yum install ${INSTALL_FLAGS}" redhat_is_installed \ - gcc-c++ pcre-devel zlib-devel make unzip wget libuuid-devel + gcc-c++ pcre-devel zlib-devel make unzip wget -q libuuid-devel if gcc_too_old; then if [ ! -e /opt/rh/devtoolset-2/root/usr/bin/gcc ]; then diff --git a/scripts/install_fail2ban.sh b/scripts/install_fail2ban.sh index 7a983db..50b01a0 100755 --- a/scripts/install_fail2ban.sh +++ b/scripts/install_fail2ban.sh @@ -68,7 +68,7 @@ function init_fail2ban_install() { fail2ban_download_link="https://github.com/fail2ban/fail2ban/archive/${FAIL2BAN_VERSION}.tar.gz" if curl -sLI "${fail2ban_download_link}" | grep -q "HTTP/[.12]* [2].."; then - run wget "${fail2ban_download_link}" -O fail2ban.tar.gz -q --show-progress && \ + run wget -q "${fail2ban_download_link}" -O fail2ban.tar.gz && \ run tar -zxf fail2ban.tar.gz && \ run cd fail2ban-*/ && \ run python setup.py install && \ diff --git a/scripts/install_imagemagick.sh b/scripts/install_imagemagick.sh index 310c3e6..bc1d4d2 100755 --- a/scripts/install_imagemagick.sh +++ b/scripts/install_imagemagick.sh @@ -70,7 +70,7 @@ function init_imagemagick_install() { fi run cd "${BUILD_DIR}" && \ - run wget "${IMAGEMAGICK_ZIP_URL}" -q --show-progress && \ + run wget -q "${IMAGEMAGICK_ZIP_URL}" && \ run tar -zxf "${IMAGEMAGICK_FILENAME}" && \ run cd ImageMagick-*/ && \ run ./configure && \ diff --git a/scripts/install_memcached.sh b/scripts/install_memcached.sh index dd772a6..d962e14 100755 --- a/scripts/install_memcached.sh +++ b/scripts/install_memcached.sh @@ -90,7 +90,7 @@ function init_memcached_install() { fi if curl -sLI "${MEMCACHED_DOWNLOAD_URL}" | grep -q "HTTP/[.12]* [2].."; then - run wget "${MEMCACHED_DOWNLOAD_URL}" -O memcached.tar.gz -q --show-progress && \ + run wget -q "${MEMCACHED_DOWNLOAD_URL}" -O memcached.tar.gz && \ run tar -zxf memcached.tar.gz && \ run cd memcached-* && \ diff --git a/scripts/install_php.sh b/scripts/install_php.sh index 02f01d9..238100e 100755 --- a/scripts/install_php.sh +++ b/scripts/install_php.sh @@ -138,7 +138,9 @@ function install_php() { run pecl channel-update pear.php.net if [[ "${#PHP_PECL_EXTS[@]}" -gt 0 ]]; then - run pecl -d "php_suffix=${PHPv}" install "${PHP_PECL_EXTS[@]}" + run pecl -d "php_suffix=${PHPv}" install \ + -D 'enable-sockets="no" enable-openssl="yes" enable-http2="yes" enable-mysqlnd="yes" enable-swoole-json="yes" enable-swoole-curl="yes" enable-cares="yes" with-postgres="yes"' \ + "${PHP_PECL_EXTS[@]}" fi # Install additional PHP extensions. @@ -629,11 +631,11 @@ function install_ioncube_loader() { ARCH=${ARCH:-$(uname -p)} if [[ "${ARCH}" == "x86_64" ]]; then - run wget -q --show-progress "https://downloads2.ioncube.com/loader_downloads/ioncube_loaders_lin_x86-64.tar.gz" + run wget -q "https://downloads2.ioncube.com/loader_downloads/ioncube_loaders_lin_x86-64.tar.gz" run tar -xzf ioncube_loaders_lin_x86-64.tar.gz run rm -f ioncube_loaders_lin_x86-64.tar.gz else - run wget -q --show-progress "https://downloads2.ioncube.com/loader_downloads/ioncube_loaders_lin_x86.tar.gz" + run wget -q "https://downloads2.ioncube.com/loader_downloads/ioncube_loaders_lin_x86.tar.gz" run tar -xzf ioncube_loaders_lin_x86.tar.gz run rm -f ioncube_loaders_lin_x86.tar.gz fi @@ -701,11 +703,11 @@ function install_sourceguardian_loader() { ARCH=${ARCH:-$(uname -p)} if [[ "${ARCH}" == "x86_64" ]]; then - run wget -q --show-progress "https://www.sourceguardian.com/loaders/download/loaders.linux-x86_64.tar.gz" + run wget -q "https://www.sourceguardian.com/loaders/download/loaders.linux-x86_64.tar.gz" run tar -xzf loaders.linux-x86_64.tar.gz run rm -f loaders.linux-x86_64.tar.gz else - run wget -q --show-progress "https://www.sourceguardian.com/loaders/download/loaders.linux-x86.tar.gz" + run wget -q "https://www.sourceguardian.com/loaders/download/loaders.linux-x86.tar.gz" run tar -xzf loaders.linux-x86.tar.gz run rm -f loaders.linux-x86.tar.gz fi diff --git a/scripts/install_redis.sh b/scripts/install_redis.sh index fbc940f..2eec15f 100755 --- a/scripts/install_redis.sh +++ b/scripts/install_redis.sh @@ -99,7 +99,7 @@ function init_redis_install { fi if curl -sLI "${REDIS_DOWNLOAD_URL}" | grep -q "HTTP/[.12]* [2].."; then - run wget -q --show-progress -O "redis.tar.gz" "${REDIS_DOWNLOAD_URL}" && \ + run wget -q -O "redis.tar.gz" "${REDIS_DOWNLOAD_URL}" && \ run tar -zxf "redis.tar.gz" && \ run cd redis-* && \ run make && \ diff --git a/scripts/install_tools.sh b/scripts/install_tools.sh index 450b473..ed750ae 100755 --- a/scripts/install_tools.sh +++ b/scripts/install_tools.sh @@ -76,10 +76,10 @@ function init_tools_install() { [ ! -d /usr/share/nginx/html/lcp/dbadmin ] && run mkdir -p /usr/share/nginx/html/lcp/dbadmin # Overwrite existing files. - run wget https://github.com/vrana/adminer/releases/download/v4.8.1/adminer-4.8.1.php \ - -O /usr/share/nginx/html/lcp/dbadmin/index.php -q --show-progress - run wget https://github.com/vrana/adminer/releases/download/v4.8.1/editor-4.8.1.php \ - -O /usr/share/nginx/html/lcp/dbadmin/editor.php -q --show-progress + run wget -q https://github.com/vrana/adminer/releases/download/v4.8.1/adminer-4.8.1.php \ + -O /usr/share/nginx/html/lcp/dbadmin/index.php + run wget -q https://github.com/vrana/adminer/releases/download/v4.8.1/editor-4.8.1.php \ + -O /usr/share/nginx/html/lcp/dbadmin/editor.php # Install File Manager. # Experimental: Tinyfilemanager https://github.com/joglomedia/tinyfilemanager @@ -92,8 +92,8 @@ function init_tools_install() { CURRENT_DIR=$(pwd) run cd /usr/share/nginx/html/lcp/filemanager && \ #run git pull -q - run wget https://raw.githubusercontent.com/joglomedia/tinyfilemanager/lemperfm_1.3.0/index.php \ - -O /usr/share/nginx/html/lcp/filemanager/index.php -q --show-progress && \ + run wget -q https://raw.githubusercontent.com/joglomedia/tinyfilemanager/lemperfm_1.3.0/index.php \ + -O /usr/share/nginx/html/lcp/filemanager/index.php && \ run cd "${CURRENT_DIR}" || return 1 fi @@ -104,8 +104,8 @@ function init_tools_install() { fi # Install Zend OpCache Web Admin. - run wget https://raw.github.com/rlerdorf/opcache-status/master/opcache.php \ - -O /usr/share/nginx/html/lcp/opcache.php -q --show-progress + run wget -q https://raw.github.com/rlerdorf/opcache-status/master/opcache.php \ + -O /usr/share/nginx/html/lcp/opcache.php # Install phpMemcachedAdmin Web Admin. if [ ! -d /usr/share/nginx/html/lcp/memcadmin/ ]; then diff --git a/scripts/install_vsftpd.sh b/scripts/install_vsftpd.sh index 9d7b1a6..e6c1704 100755 --- a/scripts/install_vsftpd.sh +++ b/scripts/install_vsftpd.sh @@ -133,7 +133,7 @@ function init_vsftpd_install() { fi run cd "${BUILD_DIR}" && \ - run wget "${VSFTPD_ZIP_URL}" -q --show-progress && \ + run wget -q "${VSFTPD_ZIP_URL}" && \ run tar -zxf "${VSFTPD_FILENAME}" && \ run cd vsftpd-*/ && \ run make && \ diff --git a/scripts/secure_server.sh b/scripts/secure_server.sh index 6d05545..eea58d2 100755 --- a/scripts/secure_server.sh +++ b/scripts/secure_server.sh @@ -392,7 +392,7 @@ function install_apf() { echo "Installing APF+BFD firewall..." if curl -sLI "https://github.com/rfxn/advanced-policy-firewall/archive/${APF_VERSION}.tar.gz" \ | grep -q "HTTP/[.12]* [2].."; then - run wget -q --show-progress "https://github.com/rfxn/advanced-policy-firewall/archive/${APF_VERSION}.tar.gz" && \ + run wget -q "https://github.com/rfxn/advanced-policy-firewall/archive/${APF_VERSION}.tar.gz" && \ run tar -xf "${APF_VERSION}.tar.gz" && \ run cd advanced-policy-firewall-*/ && \ run bash install.sh && \