Merge pull request #13 from opendesktop/develop

Develop

ocs-manager.pro

-message("Please execute scripts/import.sh for build dependencies")
-
 ios|android|!isEmpty(APP_MOBILE) {
     DEFINES += APP_MOBILE
 } else {

pkg/appimage/appimage.sh

 #!/bin/sh
 
+PKGNAME='ocs-manager'
+PKGVER='0.0.0'
+PKGREL='1'
+
+curl -L -o linuxdeployqt "https://github.com/probonopd/linuxdeployqt/releases/download/continuous/linuxdeployqt-continuous-x86_64.AppImage"
+chmod 755 linuxdeployqt
+./linuxdeployqt --appimage-extract
+
 sh scripts/import.sh
 qmake PREFIX="/usr"
 make
-make INSTALL_ROOT="ocs-manager.AppDir" install
+make INSTALL_ROOT="${PKGNAME}.AppDir" install
 
-curl -L -o linuxdeployqt.AppImage "https://github.com/probonopd/linuxdeployqt/releases/download/continuous/linuxdeployqt-continuous-x86_64.AppImage"
-chmod 755 linuxdeployqt.AppImage
-./linuxdeployqt.AppImage --appimage-extract
+./squashfs-root/AppRun ${PKGNAME}.AppDir/usr/share/applications/${PKGNAME}.desktop -bundle-non-qt-libs -no-translations
+./squashfs-root/AppRun ${PKGNAME}.AppDir/usr/share/applications/${PKGNAME}.desktop -appimage
 
-./squashfs-root/AppRun ocs-manager.AppDir/usr/share/applications/ocs-manager.desktop -bundle-non-qt-libs -no-translations
-./squashfs-root/AppRun ocs-manager.AppDir/usr/share/applications/ocs-manager.desktop -appimage
+mv *.AppImage ${PKGNAME}-${PKGVER}-${PKGREL}-x86_64.AppImage

scripts/build-docker.sh

 #!/bin/bash
 
-################################################################################
-# This is wrapper script for build.sh use from inside docker container
-################################################################################
-
 PKGNAME='ocs-manager'
 
 PKGUSER='pkgbuilder'

scripts/build.sh

 #!/bin/bash
 
-################################################################################
-# This is utility script to build distribution packages
-################################################################################
-
 PKGNAME='ocs-manager'
 
 BUILDTYPE=''

scripts/import.sh

 #!/bin/bash
 
-################################################################################
-# This is utility script to import build dependencies
-################################################################################
-
 PROJDIR="$(cd "$(dirname "${0}")/../" && pwd)"
 
 if [ ! -d "${PROJDIR}/lib/qtlib" ]; then