From 6f8691358975f0e88682edd826d01c326ff3f386 Mon Sep 17 00:00:00 2001 From: Chase Wright Date: Mon, 14 Aug 2017 12:15:19 -0500 Subject: [PATCH] Added dpkg-dev to the apt list and re-ordered --- guac-install.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/guac-install.sh b/guac-install.sh index 8c58d77..61ea826 100644 --- a/guac-install.sh +++ b/guac-install.sh @@ -37,13 +37,10 @@ else JPEGTURBO="libjpeg62-turbo-dev" fi -# Get build-folder -BUILD_FOLDER=$(dpkg-architecture -qDEB_BUILD_GNU_TYPE) - # Install Features apt-get -qq -y install build-essential libcairo2-dev ${JPEGTURBO} libpng12-dev libossp-uuid-dev libavcodec-dev libavutil-dev \ libswscale-dev libfreerdp-dev libpango1.0-dev libssh2-1-dev libtelnet-dev libvncserver-dev libpulse-dev libssl-dev \ -libvorbis-dev libwebp-dev mysql-server mysql-client mysql-common mysql-utilities ${TOMCAT} freerdp ghostscript jq wget curl +libvorbis-dev libwebp-dev mysql-server mysql-client mysql-common mysql-utilities ${TOMCAT} freerdp ghostscript jq wget curl dpkg-dev # If Apt-Get fails to run completely the rest of this isn't going to work... if [ $? != 0 ]; then @@ -51,6 +48,9 @@ if [ $? != 0 ]; then exit fi +# Get build-folder +BUILD_FOLDER=$(dpkg-architecture -qDEB_BUILD_GNU_TYPE) + SERVER=$(curl -s 'https://www.apache.org/dyn/closer.cgi?as_json=1' | jq --raw-output '.preferred|rtrimstr("/")') # Add GUACAMOLE_HOME to $TOMCAT ENV