From 21b84b1cb1a2d1a12adcd2ba268029c17f73f2fe Mon Sep 17 00:00:00 2001 From: adam kaminski Date: Thu, 10 Jan 2019 12:21:52 -0500 Subject: [PATCH] Updated script version from 0.9.14 to 1.0.0 (#60) * Update guac-upgrade.sh Adjusted version from 0.9.14 to 1.0.0 * Update guac-install.sh Updated version from 0.9.14 to 1.0.0 and commented out patching that is specific to 0.9.14 * Update README.md Adjusted version from 0.9.14 to 1.0.0 * Update guac-install-server.sh Adjusted version from 0.9.14 to 1.0.0 * Update docker-install.sh Adjusted the version from 0.9.14 to 1.0.0 --- README.md | 3 ++- docker-install.sh | 2 +- guac-install-server.sh | 2 +- guac-install.sh | 20 ++++++++++---------- guac-upgrade.sh | 2 +- 5 files changed, 15 insertions(+), 14 deletions(-) diff --git a/README.md b/README.md index 0fb27a7..4a066f6 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,6 @@ # guac-install -Script for installing Guacamole 0.9.14 on Ubuntu 16.04 or newer with MySQL. It should also work on pure Debian >= 7 (with one report of it working fine on Debian 9). Feel free to provide freeback! + +Script for installing Guacamole 1.0.0 on Ubuntu 16.04 or newer with MySQL. It should also work on pure Debian >= 7 but I have not tested. Feel free to provide freeback! Run script, enter MySQL Root Password and Guacamole User password. Guacamole User is used to connect to the Guacamole Database. diff --git a/docker-install.sh b/docker-install.sh index 445c382..f2ff31b 100644 --- a/docker-install.sh +++ b/docker-install.sh @@ -1,7 +1,7 @@ #!/bin/bash # Version number of Guacamole to install -GUACVERSION="0.9.14" +GUACVERSION="1.0.0" # Get script arguments for non-interactive mode while [ "$1" != "" ]; do diff --git a/guac-install-server.sh b/guac-install-server.sh index 30e0f3e..af66eef 100644 --- a/guac-install-server.sh +++ b/guac-install-server.sh @@ -1,7 +1,7 @@ #!/bin/bash # Version number of Guacamole to install -GUACVERSION="0.9.14" +GUACVERSION="1.0.0" # Ubuntu and Debian have different names of the libjpeg-turbo library for some reason... source /etc/os-release diff --git a/guac-install.sh b/guac-install.sh index 4da5622..397dec7 100644 --- a/guac-install.sh +++ b/guac-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="0.9.14" +GUACVERSION="1.0.0" # Colors to use for output YELLOW='\033[1;33m' @@ -171,15 +171,15 @@ mkdir -p /etc/guacamole/extensions # Install guacd cd guacamole-server-${GUACVERSION} -# Patch for Guacamole Server 0.9.14 -wget -q --show-progress -O ./src/terminal/cd0e48234a079813664052b56c501e854753303a.patch https://github.com/apache/guacamole-server/commit/cd0e48234a079813664052b56c501e854753303a.patch -if [ $? -ne 0 ]; then - echo -e "${RED}Failed to download cd0e48234a079813664052b56c501e854753303a.patch" - echo -e "https://github.com/apache/guacamole-server/commit/cd0e48234a079813664052b56c501e854753303a.patch" - echo -e "Attempting to proceed without patch...${NC}" -else - patch ./src/terminal/typescript.c ./src/terminal/cd0e48234a079813664052b56c501e854753303a.patch -fi +# Patch leftover for Guacamole Server 0.9.14 +#wget -q --show-progress -O ./src/terminal/cd0e48234a079813664052b56c501e854753303a.patch https://github.com/apache/guacamole-server/commit/cd0e48234a079813664052b56c501e854753303a.patch +#if [ $? -ne 0 ]; then +# echo -e "${RED}Failed to download cd0e48234a079813664052b56c501e854753303a.patch" +# echo -e "https://github.com/apache/guacamole-server/commit/cd0e48234a079813664052b56c501e854753303a.patch" +# echo -e "Attempting to proceed without patch...${NC}" +#else +# patch ./src/terminal/typescript.c ./src/terminal/cd0e48234a079813664052b56c501e854753303a.patch +#fi # Hack for gcc7 if [[ $(gcc --version | head -n1 | grep -oP '\)\K.*' | awk '{print $1}' | grep "^7" | wc -l) -gt 0 ]] diff --git a/guac-upgrade.sh b/guac-upgrade.sh index 63734aa..a94c97c 100644 --- 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="0.9.14" +GUACVERSION="1.0.0" # Try to get database from /etc/guacamole/guacamole.properties DATABASE=$(grep -oP 'mysql-database:\K.*' /etc/guacamole/guacamole.properties | awk '{print $1}')