frodovdr/guac-install
1
0
Fork 0
mirror of https://github.com/MysticRyuujin/guac-install.git synced 2023-10-10 13:36:56 +02:00
Code Issues Releases Wiki Activity

Patch 18.04 + Minor Fixes

Browse Source 
My installation of 18.04 did not include the `universe` repo by default. This fixes that.
This commit is contained in:
Chase Wright 2018-09-13 13:47:37 -05:00 committed by GitHub
parent 764dcbd893
commit ca284a22ff
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
guac-install.sh
View File

@ -19,10 +19,6 @@ LOG="/tmp/guacamole_${GUACVERSION}_build.log"
# Database Name # Database Name
DB="guacamole_db" DB="guacamole_db"
# Update apt so we can search apt-cache for newest tomcat version supported
apt-get -qq update
# Get script arguments for non-interactive mode # Get script arguments for non-interactive mode
while [ "$1" != "" ]; do while [ "$1" != "" ]; do
case $1 in case $1 in
@ -73,10 +69,15 @@ debconf-set-selections <<< "mysql-server mysql-server/root_password_again passwo
# Ubuntu and Debian have different package names for libjpeg # Ubuntu and Debian have different package names for libjpeg
# Ubuntu and Debian versions have differnet package names for libpng-dev # Ubuntu and Debian versions have differnet package names for libpng-dev
# Ubuntu 18.04 does not include universe repo by default
source /etc/os-release source /etc/os-release
if [[ "${NAME}" == "Ubuntu" ]] if [[ "${NAME}" == "Ubuntu" ]]
then then
JPEGTURBO="libjpeg-turbo8-dev" JPEGTURBO="libjpeg-turbo8-dev"
if [[ "${VERSION_ID}" == "18.04" ]]
then
sed -i 's/bionic main$/bionic main universe/' /etc/apt/sources.list
fi
if [[ "${VERSION_ID}" == "16.04" ]] if [[ "${VERSION_ID}" == "16.04" ]]
then then
LIBPNG="libpng12-dev" LIBPNG="libpng12-dev"
@ -97,6 +98,9 @@ else
exit 1 exit 1
fi fi
# Update apt so we can search apt-cache for newest tomcat version supported
apt-get -qq update
# Tomcat 8.0.x is End of Life, however Tomcat 7.x is not... # Tomcat 8.0.x is End of Life, however Tomcat 7.x is not...
# If Tomcat 8.5.x or newer is available install it, otherwise install Tomcat 7 # If Tomcat 8.5.x or newer is available install it, otherwise install Tomcat 7
if [[ $(apt-cache show tomcat8 | egrep "Version: 8.[5-9]" | wc -l) -gt 0 ]] if [[ $(apt-cache show tomcat8 | egrep "Version: 8.[5-9]" | wc -l) -gt 0 ]]
@ -131,7 +135,7 @@ fi
# Set SERVER to be the preferred download server from the Apache CDN # Set SERVER to be the preferred download server from the Apache CDN
SERVER="http://apache.org/dyn/closer.cgi?action=download&filename=guacamole/${GUACVERSION}" SERVER="http://apache.org/dyn/closer.cgi?action=download&filename=guacamole/${GUACVERSION}"
echo -e "${BLUE}Downloaded Files...${NC}" echo -e "${BLUE}Downloading Files...${NC}"
# Download Guacamole Server # Download Guacamole Server
wget -q --show-progress -O guacamole-server-${GUACVERSION}.tar.gz ${SERVER}/source/guacamole-server-${GUACVERSION}.tar.gz wget -q --show-progress -O guacamole-server-${GUACVERSION}.tar.gz ${SERVER}/source/guacamole-server-${GUACVERSION}.tar.gz