From 9c3ad426b39b4248d653d22ea47152d20b798a4d Mon Sep 17 00:00:00 2001 From: Bram Prieshof Date: Fri, 25 Sep 2020 10:34:44 +0200 Subject: [PATCH] Migration form apt.list to generic.pkg.list --- MySQL-ModInst.sh | 8 ++++---- apt.list => generic.pkg.list | 0 mysql-8.0.sh | 8 ++++---- 3 files changed, 8 insertions(+), 8 deletions(-) rename apt.list => generic.pkg.list (100%) diff --git a/MySQL-ModInst.sh b/MySQL-ModInst.sh index 1d1a484..ba978a7 100644 --- a/MySQL-ModInst.sh +++ b/MySQL-ModInst.sh @@ -62,8 +62,8 @@ $PKGI curl > $OUTPUT 2>&1 # Generating APT list # ##-------------------------## #Webserver specific aptList -if curl --retry 2 --retry-delay 1 --output /dev/null --silent --head --fail "$mtype"/apt.list; then - curl "$mtype"/apt.list >>/tmp/apt.list +if curl --retry 2 --retry-delay 1 --output /dev/null --silent --head --fail "$mtype"/generic.pkg.list; then + curl "$mtype"/generic.pkg.list >>/tmp/pkg.list fi @@ -90,8 +90,8 @@ fi ##-------------## $PKGM update -sed -i 's/PHPver/'$phpver'/g' /tmp/apt.list -cat /tmp/apt.list | xargs $PKGI +sed -i 's/PHPver/'$phpver'/g' /tmp/pkg.list +cat /tmp/pkg.list | xargs $PKGI ##---------------## diff --git a/apt.list b/generic.pkg.list similarity index 100% rename from apt.list rename to generic.pkg.list diff --git a/mysql-8.0.sh b/mysql-8.0.sh index 9f1813c..c805180 100644 --- a/mysql-8.0.sh +++ b/mysql-8.0.sh @@ -48,8 +48,8 @@ $PKGI curl > $OUTPUT 2>&1 # Generating APT list # ##-------------------------## #Webserver specific aptList -if curl --retry 2 --retry-delay 1 --output /dev/null --silent --head --fail "$mtype"/apt.list; then - curl "$mtype"/apt.list >>/tmp/apt.list +if curl --retry 2 --retry-delay 1 --output /dev/null --silent --head --fail "$mtype"/generic.pkg.list; then + curl "$mtype"/generic.pkg.list >>/tmp/pkg.list fi @@ -76,8 +76,8 @@ fi ##-------------## $PKGM update -sed -i 's/PHPver/'$phpver'/g' /tmp/apt.list -cat /tmp/apt.list | xargs $PKGI +sed -i 's/PHPver/'$phpver'/g' /tmp/pkg.list +cat /tmp/pkg.list | xargs $PKGI ##---------------##