s.probst/guac-install
1
0
Fork 0
mirror of https://git.koehlerweb.org/frodovdr/guac-install synced 2024-11-23 01:37:13 +01:00
Code Issues Releases Wiki Activity

add architecture check for freerdp (#12)

Browse Source 
* add shebang-row

* use FreeRDP depending on current architecture

* add architecture check
This commit is contained in:
MysticEmpires 2017-08-02 12:27:53 +02:00 committed by Chase Wright
parent a153623ce8
commit 249da0ba33
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
guac-install.sh
View File

@ -20,6 +20,9 @@ else
JPEGTURBO="libjpeg62-turbo-dev" JPEGTURBO="libjpeg62-turbo-dev"
fi fi
# Get architecture - 32 bit or 64 bit
if [ $(getconf LONG_BIT | grep 64) ]; then ARCH="x86_64"; else ARCH="i386"; fi
# Install Features # Install Features
apt-get update apt-get update
apt-get -y install build-essential libcairo2-dev $JPEGTURBO libpng12-dev libossp-uuid-dev libavcodec-dev libavutil-dev \ apt-get -y install build-essential libcairo2-dev $JPEGTURBO libpng12-dev libossp-uuid-dev libavcodec-dev libavutil-dev \
@ -68,7 +71,7 @@ cd ..
# Move files to correct locations # Move files to correct locations
mv guacamole-${VERSION}-incubating.war /etc/guacamole/guacamole.war mv guacamole-${VERSION}-incubating.war /etc/guacamole/guacamole.war
ln -s /etc/guacamole/guacamole.war /var/lib/tomcat8/webapps/ ln -s /etc/guacamole/guacamole.war /var/lib/tomcat8/webapps/
ln -s /usr/local/lib/freerdp/* /usr/lib/x86_64-linux-gnu/freerdp/. ln -s /usr/local/lib/freerdp/* /usr/lib/$ARCH-linux-gnu/freerdp/.
cp mysql-connector-java-${MCJVERSION}/mysql-connector-java-${MCJVERSION}-bin.jar /etc/guacamole/lib/ cp mysql-connector-java-${MCJVERSION}/mysql-connector-java-${MCJVERSION}-bin.jar /etc/guacamole/lib/
cp guacamole-auth-jdbc-${VERSION}-incubating/mysql/guacamole-auth-jdbc-mysql-${VERSION}-incubating.jar /etc/guacamole/extensions/ cp guacamole-auth-jdbc-${VERSION}-incubating/mysql/guacamole-auth-jdbc-mysql-${VERSION}-incubating.jar /etc/guacamole/extensions/

2
guac-upgrade.sh
View File

@ -1,3 +1,5 @@
#!/bin/bash
# Version Numbers of Guacamole and MySQL Connection/J to download # Version Numbers of Guacamole and MySQL Connection/J to download
VERSION="0.9.13" VERSION="0.9.13"
MCJVERSION="5.1.43" MCJVERSION="5.1.43"