Enabled Debian 11 support in ModInst.sh

This commit is contained in:
2021-08-18 14:46:56 +02:00
parent bf5d07169d
commit 7cc19163d5
2 changed files with 6 additions and 25 deletions

View File

@@ -27,12 +27,7 @@ password=TestP@ssword123
dist_ver=$(grep --color=never -Po "^VERSION_ID=\K.*" "/etc/os-release") dist_ver=$(grep --color=never -Po "^VERSION_ID=\K.*" "/etc/os-release")
dist=$(grep --color=never -Po "^ID=\K.*" "/etc/os-release") dist=$(grep --color=never -Po "^ID=\K.*" "/etc/os-release")
if [[ "${dist}" == *"ubuntu"* ]] && [[ "${dist_ver}" == *"18.04"* ]]; then if [[ "${dist}" == *"ubuntu"* ]] && [[ "${dist_ver}" == *"20.04"* ]]; then
PKGM="$APTMODE"
PKGI="${PKGM} install -y --no-install-recommends"
PKGLIST="apt.pkg.list"
shortdist=ubu1804
elif [[ "${dist}" == *"ubuntu"* ]] && [[ "${dist_ver}" == *"20.04"* ]]; then
PKGM="$APTMODE" PKGM="$APTMODE"
PKGI="${PKGM} install -y --no-install-recommends" PKGI="${PKGM} install -y --no-install-recommends"
PKGLIST="apt.pkg.list" PKGLIST="apt.pkg.list"
@@ -42,6 +37,11 @@ elif [[ "${dist}" == *"debian"* ]] && [[ "${dist_ver}" == *"10"* ]]; then
PKGI="${PKGM} install -y --no-install-recommends" PKGI="${PKGM} install -y --no-install-recommends"
PKGLIST="apt.pkg.list" PKGLIST="apt.pkg.list"
shortdist=deb10 shortdist=deb10
elif [[ "${dist}" == *"debian"* ]] && [[ "${dist_ver}" == *"11"* ]]; then
PKGM="$APTMODE"
PKGI="${PKGM} install -y --no-install-recommends"
PKGLIST="apt.pkg.list"
shortdist=deb11
elif [[ "${dist}" == *"centos"* ]] && [[ "${dist_ver}" == *"8"* ]]; then elif [[ "${dist}" == *"centos"* ]] && [[ "${dist_ver}" == *"8"* ]]; then
PKGM="dnf" PKGM="dnf"
PKGI="${PKGM} install --setopt=install_weak_deps=False --best -y" PKGI="${PKGM} install --setopt=install_weak_deps=False --best -y"

View File

@@ -1,19 +0,0 @@
#!/bin/bash
#MySQL GIT repo Settings
mrepo=https://git.ictmaatwerk.com/VPS-scripts/MariaDB
mbranch=master
#Removing old version
rm -rf /usr/share/phpmyadmin/*
#Installing new verion
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
#Installing custom vendor config
curl --retry 7 --retry-delay 5 -s "$mrepo"/raw/branch/"$mbranch"/config/phpmyadmin/vendor_config.php -o /usr/share/phpmyadmin/libraries/vendor_config.php
#Resetting permissions
chown Backend:Backend /usr/share/phpmyadmin -R ##WebV2
#chown www-data:www-data /usr/share/phpmyadmin -R #For legacy installs only