1
0
mirror of https://github.com/MysticRyuujin/guac-install.git synced 2023-10-10 13:36:56 +02:00

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
This commit is contained in:
adam kaminski 2019-01-10 12:21:52 -05:00 committed by Chase Wright
parent 06e734b9c1
commit 21b84b1cb1
5 changed files with 15 additions and 14 deletions

View File

@ -1,5 +1,6 @@
# guac-install # 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. Run script, enter MySQL Root Password and Guacamole User password. Guacamole User is used to connect to the Guacamole Database.

View File

@ -1,7 +1,7 @@
#!/bin/bash #!/bin/bash
# Version number of Guacamole to install # Version number of Guacamole to install
GUACVERSION="0.9.14" GUACVERSION="1.0.0"
# Get script arguments for non-interactive mode # Get script arguments for non-interactive mode
while [ "$1" != "" ]; do while [ "$1" != "" ]; do

View File

@ -1,7 +1,7 @@
#!/bin/bash #!/bin/bash
# Version number of Guacamole to install # 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... # Ubuntu and Debian have different names of the libjpeg-turbo library for some reason...
source /etc/os-release source /etc/os-release

View File

@ -4,7 +4,7 @@
if ! [ $(id -u) = 0 ]; then echo "Please run this script as sudo or root"; exit 1 ; fi if ! [ $(id -u) = 0 ]; then echo "Please run this script as sudo or root"; exit 1 ; fi
# Version number of Guacamole to install # Version number of Guacamole to install
GUACVERSION="0.9.14" GUACVERSION="1.0.0"
# Colors to use for output # Colors to use for output
YELLOW='\033[1;33m' YELLOW='\033[1;33m'
@ -171,15 +171,15 @@ mkdir -p /etc/guacamole/extensions
# Install guacd # Install guacd
cd guacamole-server-${GUACVERSION} cd guacamole-server-${GUACVERSION}
# Patch for Guacamole Server 0.9.14 # 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 #wget -q --show-progress -O ./src/terminal/cd0e48234a079813664052b56c501e854753303a.patch https://github.com/apache/guacamole-server/commit/cd0e48234a079813664052b56c501e854753303a.patch
if [ $? -ne 0 ]; then #if [ $? -ne 0 ]; then
echo -e "${RED}Failed to download cd0e48234a079813664052b56c501e854753303a.patch" # echo -e "${RED}Failed to download cd0e48234a079813664052b56c501e854753303a.patch"
echo -e "https://github.com/apache/guacamole-server/commit/cd0e48234a079813664052b56c501e854753303a.patch" # echo -e "https://github.com/apache/guacamole-server/commit/cd0e48234a079813664052b56c501e854753303a.patch"
echo -e "Attempting to proceed without patch...${NC}" # echo -e "Attempting to proceed without patch...${NC}"
else #else
patch ./src/terminal/typescript.c ./src/terminal/cd0e48234a079813664052b56c501e854753303a.patch # patch ./src/terminal/typescript.c ./src/terminal/cd0e48234a079813664052b56c501e854753303a.patch
fi #fi
# Hack for gcc7 # Hack for gcc7
if [[ $(gcc --version | head -n1 | grep -oP '\)\K.*' | awk '{print $1}' | grep "^7" | wc -l) -gt 0 ]] if [[ $(gcc --version | head -n1 | grep -oP '\)\K.*' | awk '{print $1}' | grep "^7" | wc -l) -gt 0 ]]

View File

@ -4,7 +4,7 @@
if ! [ $(id -u) = 0 ]; then echo "Please run this script as sudo or root"; exit 1 ; fi if ! [ $(id -u) = 0 ]; then echo "Please run this script as sudo or root"; exit 1 ; fi
# Version number of Guacamole to install # Version number of Guacamole to install
GUACVERSION="0.9.14" GUACVERSION="1.0.0"
# Try to get database from /etc/guacamole/guacamole.properties # Try to get database from /etc/guacamole/guacamole.properties
DATABASE=$(grep -oP 'mysql-database:\K.*' /etc/guacamole/guacamole.properties | awk '{print $1}') DATABASE=$(grep -oP 'mysql-database:\K.*' /etc/guacamole/guacamole.properties | awk '{print $1}')