diff --git a/install.sh b/install.sh index 8bfcf6d..7ab4ca3 100644 --- a/install.sh +++ b/install.sh @@ -81,19 +81,19 @@ fi # Setup prereqs for server # common named prereqs -prereq="curl wget unzip tar" +PREREQ="curl wget unzip tar" echo "Installing prerequisites" 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 install -y "${prereq}" # git + sudo apt-get install -y "${PREREQ}" # git elif [ "$OS" = "CentOS" ] || [ "$OS" = "RedHat" ] || [ "${UPSTREAM_ID}" = "rhel" ] ; then # opensuse 15.4 fails to run the relay service and hangs waiting for it # needs more work before it can be enabled # || [ "${UPSTREAM_ID}" = "suse" ] - prereq+=" bind-utils" + PREREQ+=" bind-utils" sudo yum update -y - sudo yum install -y "${prereq}" # git + sudo yum install -y "${PREREQ}" # git else echo "Unsupported OS" # here you could ask the user for permission to try and install anyway diff --git a/update.sh b/update.sh index fcf75cb..a1b5ba7 100644 --- a/update.sh +++ b/update.sh @@ -59,16 +59,16 @@ fi # Setup prereqs for server # common named prereqs -prereq="curl wget unzip tar" +PREREQ="curl wget unzip tar" echo "Installing prerequisites" 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 install -y "${prereq}" # git + sudo apt-get install -y "${PREREQ}" # git elif [ "$OS" = "CentOS" ] || [ "$OS" = "RedHat" ] || [ "${UPSTREAM_ID}" = "rhel" ]; then - prereq+=" bind-utils" + PREREQ+=" bind-utils" sudo yum update -y - sudo yum install -y "${prereq}" # git + sudo yum install -y "${PREREQ}" # git else echo "Unsupported OS" # here you could ask the user for permission to try and install anyway