Merge pull request #19 from opendesktop/develop

Develop

app/configs/application.json

 {
     "id": "ocs-manager",
     "name": "ocs-manager",
-    "version": "0.5.1",
+    "version": "0.5.2",
     "organization": "Opendesktop.org",
     "domain": "org.opendesktop.ocs-manager",
     "icon": ":/desktop/ocs-manager.svg",

pkg/appimage/appimage.sh

 #!/bin/sh
 
 PKGNAME='ocs-manager'
-PKGVER='0.5.1'
+PKGVER='0.5.2'
 PKGREL='1'
 
 curl -L -o linuxdeployqt "https://github.com/probonopd/linuxdeployqt/releases/download/continuous/linuxdeployqt-continuous-x86_64.AppImage"

scripts/build-docker.sh

@@ -49,7 +49,6 @@ build_appimage() {
     apt update -qq
 
     apt -y install build-essential libgl1-mesa-dev qt59base qt59websockets
-    source /opt/qt59/bin/qt59-env.sh
 
     curl -fsSL https://cmake.org/files/v3.10/cmake-3.10.0-rc5-Linux-x86_64.tar.gz | tar -xz --strip-components=1 -C /
     apt -y install libssl-dev libcurl3 libcurl3-gnutls libcurl4-gnutls-dev libxpm-dev
@@ -58,7 +57,7 @@ build_appimage() {
     export HOME="/home/${PKGUSER}"
     chown -R ${PKGUSER}:${PKGUSER} "${PROJDIR}"
 
-    su -c "sh "${BUILDSCRIPT}" ${BUILDTYPE}" ${PKGUSER}
+    su -c "source /opt/qt59/bin/qt59-env.sh && sh "${BUILDSCRIPT}" ${BUILDTYPE}" ${PKGUSER}
 
     transfer_file "$(find "${PROJDIR}/build_"*${BUILDTYPE} -type f -name "${PKGNAME}*.AppImage")"
 }