Merge branch 'develop'

.gitlab-ci.yml

@@ -8,5 +8,5 @@ appimage:
     - master
     - /^release\-.+/
   script:
-    - ./scripts/package ci_appimage
+    - ./scripts/package appimage
     - cat transfer.log

.travis.yml

-dist: trusty
-sudo: required
-services:
-  - docker
-
-branches:
-  only:
-    - master
-    - /^release\-.+/
-
-script:
-  - mntdir='/mnt/ocs-manager'
-  - docker run --rm -v $(pwd):${mntdir} ubuntu:14.04 /bin/bash -c "${mntdir}/scripts/package ci_appimage"
-  - cat transfer.log

pkg/appimage/appimagebuild

-#!/bin/bash
+#!/bin/sh
 
 PKGNAME='ocs-manager'
 PKGVER='0.6.5'

scripts/package

-#!/bin/bash
+#!/bin/sh
 
 PKGNAME='ocs-manager'
 
@@ -10,7 +10,7 @@ PROJDIR="$(cd "$(dirname "${0}")/../" && pwd)"
 
 BUILDDIR="${PROJDIR}/build_${PKGNAME}"
 
-ci_appimage() { # docker-image: ubuntu:14.04
+appimage() { # docker-image: ubuntu:14.04
     apt update -qq
     apt -y install curl git
     #apt -y install build-essential qt5-default libqt5websockets5-dev
@@ -24,7 +24,7 @@ ci_appimage() { # docker-image: ubuntu:14.04
     apt update -qq
 
     apt -y install build-essential mesa-common-dev libglu1-mesa-dev qt59base qt59websockets
-    curl -fsSL https://cmake.org/files/v3.11/cmake-3.11.4-Linux-x86_64.tar.gz | tar -xz --strip-components=1 -C /
+    curl -fsSL https://cmake.org/files/v3.12/cmake-3.12.1-Linux-x86_64.tar.gz | tar -xz --strip-components=1 -C /
     apt -y install libssl-dev libcurl3 libcurl3-gnutls libcurl4-gnutls-dev libxpm-dev
 
     useradd -m ${PKGUSER}
@@ -46,13 +46,13 @@ build_appimage() {
 }
 
 export_srcarchive() {
-    if [[ "${1}" ]]; then
+    if [ "${1}" ]; then
         $(cd "${PROJDIR}" && git archive --prefix="${PKGNAME}/" --output="${1}" HEAD)
     fi
 }
 
 transfer_file() {
-    if [[ -f "${1}" ]]; then
+    if [ -f "${1}" ]; then
         filename="$(basename "${1}")"
         transferlog="${PROJDIR}/transfer.log"
         echo "Uploading ${filename}" >> "${transferlog}"
@@ -61,6 +61,6 @@ transfer_file() {
     fi
 }
 
-if [[ "${1}" = 'ci_'* || "${1}" = 'build_'* ]]; then
+if [ "${1}" ]; then
     ${1}
 fi

scripts/prepare

-#!/bin/bash
+#!/bin/sh
 
 PROJDIR="$(cd "$(dirname "${0}")/../" && pwd)"
 
-if [[ ! -d "${PROJDIR}/lib/qtil" ]]; then
+if [ ! -d "${PROJDIR}/lib/qtil" ]; then
     git clone https://github.com/akiraohgaki/qtil.git -b release-0.4.0 --single-branch --depth=1 "${PROJDIR}/lib/qtil"
 fi
 
-if [[ ! -d "${PROJDIR}/lib/AppImageUpdate" ]]; then
+if [ ! -d "${PROJDIR}/lib/AppImageUpdate" ]; then
     git clone https://github.com/AppImage/AppImageUpdate.git -b continuous --single-branch --depth=1 "${PROJDIR}/lib/AppImageUpdate"
     git -C "${PROJDIR}/lib/AppImageUpdate" submodule update --init --recursive #--depth=1
 fi
 
-if [[ ! -d "${PROJDIR}/lib/AppImageUpdate-prebuilt" ]]; then
+if [ ! -d "${PROJDIR}/lib/AppImageUpdate-prebuilt" ]; then
     mkdir "${PROJDIR}/lib/AppImageUpdate-prebuilt"
     cd "${PROJDIR}/lib/AppImageUpdate-prebuilt"
-    cmake "${PROJDIR}/lib/AppImageUpdate" -DUSE_SYSTEM_CURL=ON -DBUILD_CPR_TESTS=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo
+    cmake "${PROJDIR}/lib/AppImageUpdate" -DBUILD_QT_UI=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo
     make libappimageupdate_static
 fi