Merge pull request #20 from opendesktop/develop

Develop

app/configs/application.json

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

lib/lib.pri

@@ -11,7 +11,8 @@ unix:!ios:!android {
         -L$${PWD}/AppImageUpdate-prebuilt/lib/zsync2/lib/libzsync/ -lzsync \
         -L$${PWD}/AppImageUpdate-prebuilt/lib/zsync2/lib/librcksum/ -lrcksum \
         -L$${PWD}/AppImageUpdate-prebuilt/lib/zsync2/lib/zlib/ -lz \
-        -L$${PWD}/AppImageUpdate-prebuilt/lib/ -lcpr
+        -L$${PWD}/AppImageUpdate-prebuilt/lib/ -lcpr \
+        $${PWD}/AppImageUpdate-prebuilt/lib/zsync2/lib/hashlib/hashlib.a
 
     PRE_TARGETDEPS += \
         $${PWD}/AppImageUpdate-prebuilt/src/libappimageupdate.a \
@@ -19,7 +20,8 @@ unix:!ios:!android {
         $${PWD}/AppImageUpdate-prebuilt/lib/zsync2/lib/libzsync/libzsync.a \
         $${PWD}/AppImageUpdate-prebuilt/lib/zsync2/lib/librcksum/librcksum.a \
         $${PWD}/AppImageUpdate-prebuilt/lib/zsync2/lib/zlib/libz.a \
-        $${PWD}/AppImageUpdate-prebuilt/lib/libcpr.a
+        $${PWD}/AppImageUpdate-prebuilt/lib/libcpr.a \
+        $${PWD}/AppImageUpdate-prebuilt/lib/zsync2/lib/hashlib/hashlib.a
 
     LIBS += -lcurl
 }

pkg/appimage/appimage.sh

 #!/bin/sh
 
 PKGNAME='ocs-manager'
-PKGVER='0.5.2'
+PKGVER='0.5.3'
 PKGREL='1'
 
 curl -L -o linuxdeployqt "https://github.com/probonopd/linuxdeployqt/releases/download/continuous/linuxdeployqt-continuous-x86_64.AppImage"
@@ -19,6 +19,10 @@ install -D -m 755 /lib/x86_64-linux-gnu/libssl.so.1.0.0 ${PKGNAME}.AppDir/usr/li
 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/bin/unzip ${PKGNAME}.AppDir/usr/bin/unzip
+install -D -m 755 /usr/lib/p7zip/7zr ${PKGNAME}.AppDir/usr/bin/7z
+install -D -m 755 /usr/bin/unrar-free ${PKGNAME}.AppDir/usr/bin/unrar
+
 ./squashfs-root/AppRun ${PKGNAME}.AppDir/usr/share/applications/${PKGNAME}.desktop -appimage
 
 mv *.AppImage ${PKGNAME}-${PKGVER}-${PKGREL}-x86_64.AppImage

scripts/build-docker.sh

@@ -42,6 +42,7 @@ build_appimage() {
     #apt -y install build-essential qt5-default libqt5websockets5-dev
     #apt -y install cmake libssl-dev libcurl4-gnutls-dev libxpm-dev
     apt -y install libssl1.0.0 zlib1g
+    apt -y install unzip p7zip unrar-free
 
     add-apt-repository -y ppa:beineri/opt-qt593-trusty
     echo 'deb http://download.opensuse.org/repositories/home:/TheAssassin:/AppImageLibraries/xUbuntu_14.04/ /' > /etc/apt/sources.list.d/curl-httponly.list