diff --git a/app/configs/application.json b/app/configs/application.json index 23668cd81516f57839776d495c93c8cb69c8715d..394fda7249dffcc2ea9fb26bf2e7b3a330fe564e 100644 --- a/app/configs/application.json +++ b/app/configs/application.json @@ -1,7 +1,7 @@ { "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", diff --git a/pkg/appimage/appimage.sh b/pkg/appimage/appimage.sh index 19b32f60d2f6f8537b9541d7c41ada34c1830d87..2643a46e1be896f36c2bb66d0c35145f6d68ebf1 100644 --- a/pkg/appimage/appimage.sh +++ b/pkg/appimage/appimage.sh @@ -1,7 +1,7 @@ #!/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" diff --git a/scripts/build-docker.sh b/scripts/build-docker.sh index d9f8c535477f4f2413f55f3b99ee0daaaada1198..565a0d0faee4ebb1bdbdf7f74910ddfe4275c4e4 100644 --- a/scripts/build-docker.sh +++ b/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")" }