Work_Archive/VPS-scripts_MariaDB
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Removed wget in favor of curl

Browse Source
This commit is contained in:
Bram Prieshof
2020-10-01 11:40:45 +02:00
parent b73f9b03fb
commit a32dc99e6c
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
MySQL-ModInst.sh
View File

@@ -83,7 +83,7 @@ fi
##--------------------------## ##--------------------------##
msg "Starting installer." 8 78 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 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

12
conf.sh
View File

@@ -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 rm -rf /etc/mysql/ /etc/my.cnf.d/ /etc/my.cnf
mkdir /etc/mysql/ 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 if [ "$shortdist" = "ubu1804" ] || [ "$shortdist" = "ubu2004" ] || [ "$shortdist" = "deb10" ] ; then
MYSQLSNAME=mysql MYSQLSNAME=mysql
systemctl stop $MYSQLSNAME systemctl stop $MYSQLSNAME
@@ -30,14 +30,14 @@ if [ $PHPMyadmin = 1 ]; then
mkdir -p /etc/phpmyadmin mkdir -p /etc/phpmyadmin
mkdir -p /var/log/PhpMyAdmin mkdir -p /var/log/PhpMyAdmin
mkdir -p /var/lib/phpmyadmin/tmp/ 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 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 curl --retry 7 --retry-delay 5 -s "$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 curl --retry 7 --retry-delay 5 -s "$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 curl --retry 7 --retry-delay 5 -s "$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/config.inc.php -O /etc/phpmyadmin/config.inc.php
touch /var/lib/phpmyadmin/config.inc.php touch /var/lib/phpmyadmin/config.inc.php
touch /etc/phpmyadmin/config-db.php touch /etc/phpmyadmin/config-db.php

2
mysql-8.0.sh
View File

@@ -80,7 +80,7 @@ echo "$1"
##--------------------------## ##--------------------------##
msg "Starting installer." 8 78 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 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