frodovdr/guac-install
1
0
Fork 0
mirror of https://github.com/MysticRyuujin/guac-install.git synced 2023-10-10 13:36:56 +02:00
Code Issues Releases Wiki Activity

change the old architecture check (#16)

Browse Source
This commit is contained in:
MysticEmpires 2017-08-03 13:32:47 +02:00 committed by Chase Wright
parent 2161ea5ab6
commit f6dc0c19da
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
guac-install.sh
View File

@ -37,8 +37,8 @@ else
JPEGTURBO="libjpeg62-turbo-dev" JPEGTURBO="libjpeg62-turbo-dev"
fi fi
# Get architecture - 32 bit or 64 bit # Get build-folder
if [ $(getconf LONG_BIT | grep 64) ]; then ARCH="x86_64"; else ARCH="i386"; fi BUILD_FOLDER=$(dpkg-architecture -qDEB_BUILD_GNU_TYPE)
# Install Features # Install Features
apt-get -qq -y install build-essential libcairo2-dev ${JPEGTURBO} libpng12-dev libossp-uuid-dev libavcodec-dev libavutil-dev \ apt-get -qq -y install build-essential libcairo2-dev ${JPEGTURBO} libpng12-dev libossp-uuid-dev libavcodec-dev libavutil-dev \
@ -86,7 +86,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/${TOMCAT}/webapps/ ln -s /etc/guacamole/guacamole.war /var/lib/${TOMCAT}/webapps/
ln -s /usr/local/lib/freerdp/* /usr/lib/$ARCH-linux-gnu/freerdp/. ln -s /usr/local/lib/freerdp/guac*.so /usr/lib/$BUILD_FOLDER/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/