conform case

This commit is contained in:
Phil Clifford 2022-08-12 12:55:47 +01:00
parent 54944d2014
commit fc9a935121
2 changed files with 10 additions and 10 deletions

View File

@ -81,19 +81,19 @@ fi
# Setup prereqs for server # Setup prereqs for server
# common named prereqs # common named prereqs
prereq="curl wget unzip tar" PREREQ="curl wget unzip tar"
echo "Installing prerequisites" echo "Installing prerequisites"
if [ "${ID}" = "debian" ] || [ "$OS" = "Ubuntu" ] || [ "$OS" = "Debian" ] || [ "${UPSTREAM_ID}" = "ubuntu" ] || [ "${UPSTREAM_ID}" = "debian" ]; then if [ "${ID}" = "debian" ] || [ "$OS" = "Ubuntu" ] || [ "$OS" = "Debian" ] || [ "${UPSTREAM_ID}" = "ubuntu" ] || [ "${UPSTREAM_ID}" = "debian" ]; then
prereq+=" dnsutils" PREREQ+=" dnsutils"
sudo apt-get update sudo apt-get update
sudo apt-get install -y "${prereq}" # git sudo apt-get install -y "${PREREQ}" # git
elif [ "$OS" = "CentOS" ] || [ "$OS" = "RedHat" ] || [ "${UPSTREAM_ID}" = "rhel" ] ; then elif [ "$OS" = "CentOS" ] || [ "$OS" = "RedHat" ] || [ "${UPSTREAM_ID}" = "rhel" ] ; then
# opensuse 15.4 fails to run the relay service and hangs waiting for it # opensuse 15.4 fails to run the relay service and hangs waiting for it
# needs more work before it can be enabled # needs more work before it can be enabled
# || [ "${UPSTREAM_ID}" = "suse" ] # || [ "${UPSTREAM_ID}" = "suse" ]
prereq+=" bind-utils" PREREQ+=" bind-utils"
sudo yum update -y sudo yum update -y
sudo yum install -y "${prereq}" # git sudo yum install -y "${PREREQ}" # git
else else
echo "Unsupported OS" echo "Unsupported OS"
# here you could ask the user for permission to try and install anyway # here you could ask the user for permission to try and install anyway

View File

@ -59,16 +59,16 @@ fi
# Setup prereqs for server # Setup prereqs for server
# common named prereqs # common named prereqs
prereq="curl wget unzip tar" PREREQ="curl wget unzip tar"
echo "Installing prerequisites" echo "Installing prerequisites"
if [ "${ID}" = "debian" ] || [ "$OS" = "Ubuntu" ] || [ "$OS" = "Debian" ] || [ "${UPSTREAM_ID}" = "ubuntu" ] || [ "${UPSTREAM_ID}" = "debian" ]; then if [ "${ID}" = "debian" ] || [ "$OS" = "Ubuntu" ] || [ "$OS" = "Debian" ] || [ "${UPSTREAM_ID}" = "ubuntu" ] || [ "${UPSTREAM_ID}" = "debian" ]; then
prereq+=" dnsutils" PREREQ+=" dnsutils"
sudo apt-get update sudo apt-get update
sudo apt-get install -y "${prereq}" # git sudo apt-get install -y "${PREREQ}" # git
elif [ "$OS" = "CentOS" ] || [ "$OS" = "RedHat" ] || [ "${UPSTREAM_ID}" = "rhel" ]; then elif [ "$OS" = "CentOS" ] || [ "$OS" = "RedHat" ] || [ "${UPSTREAM_ID}" = "rhel" ]; then
prereq+=" bind-utils" PREREQ+=" bind-utils"
sudo yum update -y sudo yum update -y
sudo yum install -y "${prereq}" # git sudo yum install -y "${PREREQ}" # git
else else
echo "Unsupported OS" echo "Unsupported OS"
# here you could ask the user for permission to try and install anyway # here you could ask the user for permission to try and install anyway