Init intergation of multi OS support, updated docs

This commit is contained in:
2020-09-30 15:43:43 +02:00
parent 531088000a
commit 4642319096
8 changed files with 120 additions and 32 deletions

View File

@@ -32,13 +32,13 @@ if [[ "${dist}" == *"ubuntu"* ]] && [[ "${dist_ver}" == *"18.04"* ]]; then
echo "Ubuntu 18.04 Detected"
PKGM="$APTMODE"
PKGI="${PKGM} install -y --no-install-recommends"
PKGLIST="apt.pkg.list"
PKGLIST="apt"
shortdist=ubu1804
elif [[ "${dist}" == *"ubuntu"* ]] && [[ "${dist_ver}" == *"20.04"* ]]; then
echo "Ubuntu 20.04 Detected"
PKGM="$APTMODE"
PKGI="${PKGM} install -y --no-install-recommends"
PKGLIST="apt.pkg.list"
PKGLIST="apt"
echo "This os in not supported"
exit
shortdist=ubu2004
@@ -46,7 +46,7 @@ elif [[ "${dist}" == *"debian"* ]] && [[ "${dist_ver}" == *"10"* ]]; then
echo "Debian 10 Detected"
PKGM="$APTMODE"
PKGI="${PKGM} install -y --no-install-recommends"
PKGLIST="apt.pkg.list"
PKGLIST="apt"
shortdist=deb10
echo "This os in not supported"
exit
@@ -54,13 +54,13 @@ elif [[ "${dist}" == *"centos"* ]] && [[ "${dist_ver}" == *"8"* ]]; then
echo "Centos 8 Detected"
PKGM="dnf"
PKGI="${PKGM} install --setopt=install_weak_deps=False --best -y"
PKGLIST="dnf.pkg.list"
PKGLIST="dnf"
shortdist=cent8
echo "This os in not supported"
exit
else
echo "This os in not supported"
exit
echo "This os in not supported"
exit
fi
unset dist_ver dist APTMODE
@@ -69,6 +69,7 @@ unset dist_ver dist APTMODE
#Repo Vars
repo=https://git.ictmaatwerk.com/bprieshof/UBU-Web-V2
branch=master
branchtype=branch
###Select Module type
##Uncomment for CoreModules
@@ -112,14 +113,20 @@ $PKGI curl > $OUTPUT 2>&1
# Generating APT list #
##-------------------------##
#General aptList
if curl --retry 2 --retry-delay 1 --output /dev/null --silent --head --fail "$mtype"/"$webserv"-generic.pkg.list; then
curl "$mtype"/"$webserv"-generic.pkg.list >>/tmp/pkg.list
fi
#Webserver specific aptList
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
if curl --retry 2 --retry-delay 1 --output /dev/null --silent --head --fail "$mtype"/"$PKGLIST".pkg.list; then
curl "$mtype"/"$PKGLIST".pkg.list >>/tmp/pkg.list
fi
#Webserver specific aptList
if curl --retry 2 --retry-delay 1 --output /dev/null --silent --head --fail "$mtype"/"$webserv"-generic.pkg.list; then
curl "$mtype"/"$webserv"-generic.pkg.list >>/tmp/pkg.list
fi
if curl --retry 2 --retry-delay 1 --output /dev/null --silent --head --fail "$mtype"/"$webserv"-"$PKGLIST".pkg.list; then
curl "$mtype"/"$webserv"-"$PKGLIST".pkg.list >>/tmp/pkg.list
fi
##--------------------##
# Pre-Requirements #