Merge branch 'develop'

pkg/appimage/appimagebuild

@@ -4,27 +4,29 @@ PKGNAME='ocs-manager'
 PKGVER='0.7.0'
 PKGREL='1'
 
-curl -fsSL -o linuxdeployqt https://github.com/probonopd/linuxdeployqt/releases/download/continuous/linuxdeployqt-continuous-x86_64.AppImage
-chmod 755 linuxdeployqt
-./linuxdeployqt --appimage-extract
+#UPDINFO='zsync|http://***/ocs-manager-x86_64.AppImage.zsync'
+APPDIR="${PKGNAME}.AppDir"
 
 ./scripts/prepare
 qmake PREFIX=/usr
 make
-make INSTALL_ROOT="${PKGNAME}.AppDir" install
+make INSTALL_ROOT=${APPDIR} install
 
-./squashfs-root/AppRun ${PKGNAME}.AppDir/usr/share/applications/${PKGNAME}.desktop -bundle-non-qt-libs -no-translations
+curl -fsSL -o linuxdeployqt https://github.com/probonopd/linuxdeployqt/releases/download/continuous/linuxdeployqt-continuous-x86_64.AppImage
+chmod 755 linuxdeployqt
+./linuxdeployqt --appimage-extract
+./squashfs-root/AppRun ${APPDIR}/usr/share/applications/${PKGNAME}.desktop -bundle-non-qt-libs -no-translations
 
-install -D -m 755 /usr/lib/x86_64-linux-gnu/libfontconfig.so.1 ${PKGNAME}.AppDir/usr/lib/libfontconfig.so.1
-install -D -m 755 /usr/lib/x86_64-linux-gnu/libfreetype.so.6 ${PKGNAME}.AppDir/usr/lib/libfreetype.so.6
-install -D -m 755 /lib/x86_64-linux-gnu/libssl.so.1.0.0 ${PKGNAME}.AppDir/usr/lib/libssl.so.1.0.0
-install -D -m 755 /lib/x86_64-linux-gnu/libcrypto.so.1.0.0 ${PKGNAME}.AppDir/usr/lib/libcrypto.so.1.0.0
-install -D -m 755 /lib/x86_64-linux-gnu/libz.so.1 ${PKGNAME}.AppDir/usr/lib/libz.so.1
+install -D -m 755 /usr/lib/x86_64-linux-gnu/libfontconfig.so.1 ${APPDIR}/usr/lib/libfontconfig.so.1
+install -D -m 755 /usr/lib/x86_64-linux-gnu/libfreetype.so.6 ${APPDIR}/usr/lib/libfreetype.so.6
+install -D -m 755 /lib/x86_64-linux-gnu/libssl.so.1.0.0 ${APPDIR}/usr/lib/libssl.so.1.0.0
+install -D -m 755 /lib/x86_64-linux-gnu/libcrypto.so.1.0.0 ${APPDIR}/usr/lib/libcrypto.so.1.0.0
+install -D -m 755 /lib/x86_64-linux-gnu/libz.so.1 ${APPDIR}/usr/lib/libz.so.1
 
-install -D -m 755 /usr/bin/unzip ${PKGNAME}.AppDir/usr/bin/unzip
-install -D -m 755 /usr/lib/p7zip/7zr ${PKGNAME}.AppDir/usr/bin/7zr
-install -D -m 755 /usr/bin/unar ${PKGNAME}.AppDir/usr/bin/unar
+install -D -m 755 /usr/bin/unzip ${APPDIR}/usr/bin/unzip
+install -D -m 755 /usr/lib/p7zip/7zr ${APPDIR}/usr/bin/7zr
+install -D -m 755 /usr/bin/unar ${APPDIR}/usr/bin/unar
 
-./squashfs-root/AppRun ${PKGNAME}.AppDir/usr/share/applications/${PKGNAME}.desktop -appimage
+./squashfs-root/AppRun ${APPDIR}/usr/share/applications/${PKGNAME}.desktop -appimage
 
 mv *-x86_64.AppImage ${PKGNAME}-${PKGVER}-${PKGREL}-x86_64.AppImage

scripts/package

@@ -25,13 +25,13 @@ install_build_deps_appimage() {
     apt -y install libfontconfig1 libfreetype6 libssl1.0.0 zlib1g unzip p7zip unar
 
     apt -y install software-properties-common
-    add-apt-repository -y ppa:beineri/opt-qt596-trusty
+    add-apt-repository -y ppa:beineri/opt-qt597-trusty
     echo 'deb http://download.opensuse.org/repositories/home:/TheAssassin:/AppImageLibraries/xUbuntu_14.04/ /' > /etc/apt/sources.list.d/curl-httponly.list
     curl -fsSL https://download.opensuse.org/repositories/home:TheAssassin:AppImageLibraries/xUbuntu_14.04/Release.key | apt-key add -
     apt update -qq
 
     apt -y install build-essential mesa-common-dev libglu1-mesa-dev qt59base qt59websockets
-    curl -fsSL https://cmake.org/files/v3.12/cmake-3.12.1-Linux-x86_64.tar.gz | tar -xz --strip-components=1 -C /
+    curl -fsSL https://github.com/Kitware/CMake/releases/download/v3.13.3/cmake-3.13.3-Linux-x86_64.tar.gz | tar -xz --strip-components=1 -C /
     apt -y install automake libtool pkg-config wget desktop-file-utils libglib2.0-dev libcairo2-dev libssl-dev libcurl3 libcurl4-openssl-dev libxpm-dev
 }