From 6254bbb017b71a84589d62faf882a5395656b27f Mon Sep 17 00:00:00 2001 From: SoulSeekkor Date: Fri, 3 Jul 2020 20:24:18 -0500 Subject: [PATCH] Updated to version 1.2.0 and added missing libavformat-dev package. (#145) --- README.md | 4 ++-- docker-install.sh | 2 +- guac-install-server.sh | 4 ++-- guac-install.sh | 8 +++----- guac-upgrade.sh | 4 ++-- 5 files changed, 10 insertions(+), 12 deletions(-) diff --git a/README.md b/README.md index 6d19224..5a4a0ef 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,7 @@ sudo apt-get update sudo apt-get install freerdp2-dev freerdp2-x11 ``` -Script for installing Guacamole 1.1.0 on Ubuntu 16.04 or newer (with MySQL, or remote MySQL). It should also work on pure [Debian](https://www.debian.org/), [Raspbian](https://www.raspberrypi.org/downloads/raspbian/) or [Kali Linux](https://www.kali.org/). I have tested this with Debian 10.3.0 (Buster). **If other versions don't work please open an issue.** It is likely due to a required library having a different name. +Script for installing Guacamole 1.2.0 on Ubuntu 16.04 or newer (with MySQL, or remote MySQL). It should also work on pure [Debian](https://www.debian.org/), [Raspbian](https://www.raspberrypi.org/downloads/raspbian/) or [Kali Linux](https://www.kali.org/). I have tested this with Debian 10.3.0 (Buster). **If other versions don't work please open an issue.** It is likely due to a required library having a different name. Run script, enter MySQL Root Password and Guacamole User password. Guacamole User is used to connect to the Guacamole Database. @@ -108,7 +108,7 @@ NOTE: Only the switches for MySQL Host, MySQL Port and Guacamole Database are av ## WARNING -- Upgrading from 0.9.14 -> 1.1.0 has not been tested, only 1.0.0 -> 1.1.0. +- Upgrading from 0.9.14 -> 1.2.0 has not been tested, only 1.1.0 -> 1.2.0. - Switches have changed and additional ones have been added! ## How to Run: diff --git a/docker-install.sh b/docker-install.sh index b1d85af..22efeaa 100755 --- a/docker-install.sh +++ b/docker-install.sh @@ -4,7 +4,7 @@ if ! [ $(id -u) = 0 ]; then echo "Please run this script as sudo or root"; exit 1 ; fi # Version number of Guacamole to install -GUACVERSION="1.1.0" +GUACVERSION="1.2.0" # Get script arguments for non-interactive mode while [ "$1" != "" ]; do diff --git a/guac-install-server.sh b/guac-install-server.sh index 7824e5b..e35976f 100755 --- a/guac-install-server.sh +++ b/guac-install-server.sh @@ -4,7 +4,7 @@ if ! [ $(id -u) = 0 ]; then echo "Please run this script as sudo or root"; exit 1 ; fi # Version number of Guacamole to install -GUACVERSION="1.1.0" +GUACVERSION="1.2.0" # Different version of Ubuntu and Debian have different package names... source /etc/os-release @@ -35,7 +35,7 @@ fi # Install Server Features apt-get -qq update export DEBIAN_FRONTEND=noninteractive -apt-get -y install build-essential libcairo2-dev ${JPEGTURBO} ${LIBPNG} libossp-uuid-dev libavcodec-dev libavutil-dev \ +apt-get -y install build-essential libcairo2-dev ${JPEGTURBO} ${LIBPNG} libossp-uuid-dev libavcodec-dev libavformat-dev libavutil-dev \ libswscale-dev freerdp2-dev libpango1.0-dev libssh2-1-dev libtelnet-dev libvncserver-dev libpulse-dev libssl-dev \ libvorbis-dev libwebp-dev libwebsockets-dev wget libtool-bin diff --git a/guac-install.sh b/guac-install.sh index 86b0ab3..3b88ba8 100755 --- a/guac-install.sh +++ b/guac-install.sh @@ -15,7 +15,7 @@ fi # Version number of Guacamole to install # Homepage ~ https://guacamole.apache.org/releases/ -GUACVERSION="1.1.0" +GUACVERSION="1.2.0" # Latest Version of MySQL Connector/J if manual install is required (if libmariadb-java/libmysql-java is not available via apt) # Homepage ~ https://dev.mysql.com/downloads/connector/j/ @@ -302,11 +302,9 @@ echo -e "${BLUE}Installing packages. This might take a few minutes...${NC}" export DEBIAN_FRONTEND=noninteractive # Required packages -apt-get -y install build-essential libcairo2-dev ${JPEGTURBO} ${LIBPNG} libossp-uuid-dev libavcodec-dev libavutil-dev \ +apt-get -y install build-essential libcairo2-dev ${JPEGTURBO} ${LIBPNG} libossp-uuid-dev libavcodec-dev libavformat-dev libavutil-dev \ libswscale-dev freerdp2-dev libpango1.0-dev libssh2-1-dev libtelnet-dev libvncserver-dev libpulse-dev libssl-dev \ -libvorbis-dev libwebp-dev libwebsockets-dev \ -freerdp2-x11 libtool-bin ghostscript dpkg-dev \ -wget crudini \ +libvorbis-dev libwebp-dev libwebsockets-dev freerdp2-x11 libtool-bin ghostscript dpkg-dev wget crudini \ ${MYSQL} ${LIBJAVA} ${TOMCAT} &>> ${LOG} # If apt fails to run completely the rest of this isn't going to work... diff --git a/guac-upgrade.sh b/guac-upgrade.sh index 47ab8d8..5a5457f 100755 --- a/guac-upgrade.sh +++ b/guac-upgrade.sh @@ -4,7 +4,7 @@ if ! [ $(id -u) = 0 ]; then echo "Please run this script as sudo or root"; exit 1 ; fi # Version number of Guacamole to install -GUACVERSION="1.1.0" +GUACVERSION="1.2.0" # Colors to use for output YELLOW='\033[1;33m' @@ -90,7 +90,7 @@ service guacd stop apt-get -qq update # Install additional packages if they do not exist yet -apt-get -y install freerdp2-dev freerdp2-x11 libtool-bin libwebsockets-dev +apt-get -y install freerdp2-dev freerdp2-x11 libtool-bin libwebsockets-dev libavformat-dev # Download Guacamole server wget -q --show-progress -O guacamole-server-${GUACVERSION}.tar.gz ${SERVER}/source/guacamole-server-${GUACVERSION}.tar.gz