From e8571f50b7b6105fdf59c54ab6bb3ad0974f5270 Mon Sep 17 00:00:00 2001 From: Chase Wright Date: Sun, 12 Mar 2017 13:34:07 -0500 Subject: [PATCH] Variable separation Made variables into ${} for clearer separation --- guac-upgrade.sh | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/guac-upgrade.sh b/guac-upgrade.sh index d68a519..28ccdb1 100644 --- a/guac-upgrade.sh +++ b/guac-upgrade.sh @@ -5,9 +5,9 @@ SERVER=$(curl -s 'https://www.apache.org/dyn/closer.cgi?as_json=1' | jq --raw-ou service tomcat8 stop # Download and install Guacamole Server -wget $SERVER/incubator/guacamole/$VERSION-incubating/source/guacamole-server-$VERSION-incubating.tar.gz -tar -xzf guacamole-server-$VERSION-incubating.tar.gz -cd guacamole-server-$VERSION-incubating +wget ${SERVER}/incubator/guacamole/${VERSION}-incubating/source/guacamole-server-${VERSION}-incubating.tar.gz +tar -xzf guacamole-server-${VERSION}-incubating.tar.gz +cd guacamole-server-${VERSION}-incubating ./configure --with-init-dir=/etc/init.d make make install @@ -16,15 +16,15 @@ systemctl enable guacd cd .. # Download and replace Guacamole Client -wget $SERVER/incubator/guacamole/$VERSION-incubating/binary/guacamole-$VERSION-incubating.war +wget ${SERVER}/incubator/guacamole/${VERSION}-incubating/binary/guacamole-${VERSION}-incubating.war mv guacamole-0.9.11-incubating.war /etc/guacamole/guacamole.war # Download and upgrade SQL components -wget $SERVER/incubator/guacamole/$VERSION-incubating/binary/guacamole-auth-jdbc-$VERSION-incubating.tar.gz -tar -xzf guacamole-auth-jdbc-$VERSION-incubating.tar.gz -cp guacamole-auth-jdbc-$VERSION-incubating/mysql/guacamole-auth-jdbc-mysql-$VERSION-incubating.jar /etc/guacamole/extensions/ +wget ${SERVER}/incubator/guacamole/${VERSION}-incubating/binary/guacamole-auth-jdbc-${VERSION}-incubating.tar.gz +tar -xzf guacamole-auth-jdbc-${VERSION}-incubating.tar.gz +cp guacamole-auth-jdbc-${VERSION}-incubating/mysql/guacamole-auth-jdbc-mysql-${VERSION}-incubating.jar /etc/guacamole/extensions/ -mysql -u root -p guacamole_db < guacamole-auth-jdbc-$VERSION-incubating/mysql/schema/upgrade/upgrade-pre-$VERSION.sql +mysql -u root -p guacamole_db < guacamole-auth-jdbc-${VERSION}-incubating/mysql/schema/upgrade/upgrade-pre-${VERSION}.sql # Start Tomcat service tomcat8 start