From a32dc99e6cb9d84867fd94100a23c29302b38f61 Mon Sep 17 00:00:00 2001 From: Bram Prieshof Date: Thu, 1 Oct 2020 11:40:45 +0200 Subject: [PATCH] Removed wget in favor of curl --- MySQL-ModInst.sh | 2 +- conf.sh | 12 ++++++------ mysql-8.0.sh | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/MySQL-ModInst.sh b/MySQL-ModInst.sh index 05734d4..f673438 100644 --- a/MySQL-ModInst.sh +++ b/MySQL-ModInst.sh @@ -83,7 +83,7 @@ fi ##--------------------------## msg "Starting installer." 8 78 -$PKGI curl wget > $OUTPUT 2>&1 +$PKGI curl > $OUTPUT 2>&1 curl --retry 7 --retry-delay 5 -s https://git.ictmaatwerk.com/VPS-scripts/General/raw/branch/Main/Setup-Repo.sh |repo=init osrel=$shortdist bash > $OUTPUT 2>&1 diff --git a/conf.sh b/conf.sh index 137ebaf..bcbf834 100644 --- a/conf.sh +++ b/conf.sh @@ -7,7 +7,7 @@ if [ -z ${PHPMyadmin+x} ]; then echo 'Error $PHPMyadmin is not set, Setting defa rm -rf /etc/mysql/ /etc/my.cnf.d/ /etc/my.cnf mkdir /etc/mysql/ -wget -q -t7 "$mrepo"/raw/branch/"$mbranch"/config/MySQL/mysqld-V8.cnf -O /etc/mysql/my.cnf +curl --retry 7 --retry-delay 5 -s "$mrepo"/raw/branch/"$mbranch"/config/MySQL/mysqld-V8.cnf -O /etc/mysql/my.cnf if [ "$shortdist" = "ubu1804" ] || [ "$shortdist" = "ubu2004" ] || [ "$shortdist" = "deb10" ] ; then MYSQLSNAME=mysql systemctl stop $MYSQLSNAME @@ -30,14 +30,14 @@ if [ $PHPMyadmin = 1 ]; then mkdir -p /etc/phpmyadmin mkdir -p /var/log/PhpMyAdmin mkdir -p /var/lib/phpmyadmin/tmp/ - wget -q -t7 http://mirror.nxdi.nl/resources/phpmyadmin/phpMyAdmin-latest-english.tar.gz -O /tmp/phpmya.tar.gz + curl --retry 7 --retry-delay 5 -s http://mirror.nxdi.nl/resources/phpmyadmin/phpMyAdmin-latest-english.tar.gz -O /tmp/phpmya.tar.gz tar -C /usr/share/phpmyadmin -xzf /tmp/phpmya.tar.gz --strip 1 - wget -q -t7 "$mrepo"/raw/branch/"$mbranch"/config/phpmyadmin/vendor_config.php -O /usr/share/phpmyadmin/libraries/vendor_config.php - wget -q -t7 "$mrepo"/raw/branch/"$mbranch"/config/phpmyadmin/config.footer.inc.php -O /etc/phpmyadmin/config.footer.inc.php - wget -q -t7 "$mrepo"/raw/branch/"$mbranch"/config/phpmyadmin/config.header.inc.php -O /etc/phpmyadmin/config.header.inc.php - wget -q -t7 "$mrepo"/raw/branch/"$mbranch"/config/phpmyadmin/config.inc.php -O /etc/phpmyadmin/config.inc.php + curl --retry 7 --retry-delay 5 -s "$mrepo"/raw/branch/"$mbranch"/config/phpmyadmin/vendor_config.php -O /usr/share/phpmyadmin/libraries/vendor_config.php + curl --retry 7 --retry-delay 5 -s "$mrepo"/raw/branch/"$mbranch"/config/phpmyadmin/config.footer.inc.php -O /etc/phpmyadmin/config.footer.inc.php + curl --retry 7 --retry-delay 5 -s "$mrepo"/raw/branch/"$mbranch"/config/phpmyadmin/config.header.inc.php -O /etc/phpmyadmin/config.header.inc.php + curl --retry 7 --retry-delay 5 -s "$mrepo"/raw/branch/"$mbranch"/config/phpmyadmin/config.inc.php -O /etc/phpmyadmin/config.inc.php touch /var/lib/phpmyadmin/config.inc.php touch /etc/phpmyadmin/config-db.php diff --git a/mysql-8.0.sh b/mysql-8.0.sh index b9e8629..b1ac909 100644 --- a/mysql-8.0.sh +++ b/mysql-8.0.sh @@ -80,7 +80,7 @@ echo "$1" ##--------------------------## msg "Starting installer." 8 78 -$PKGI curl wget > $OUTPUT 2>&1 +$PKGI curl > $OUTPUT 2>&1 curl --retry 7 --retry-delay 5 -s https://git.ictmaatwerk.com/VPS-scripts/General/raw/branch/Main/Setup-Repo.sh |repo=init osrel=$shortdist bash > $OUTPUT 2>&1