diff --git a/.travis.yml b/.travis.yml index 36f0ca61d0665b32ebfdb11ec0c06b317a5beb57..00353ed0fbd8646223d907f28fe5c641ad795b94 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,5 +10,5 @@ branches: script: - mntdir='/mnt/ocs-manager' - - docker run --rm -v $(pwd):${mntdir} ubuntu:14.04 /bin/bash -c "sh ${mntdir}/scripts/package.sh ci_appimage" + - docker run --rm -v $(pwd):${mntdir} ubuntu:14.04 /bin/bash -c "sh ${mntdir}/scripts/package ci_appimage" - cat transfer.log diff --git a/pkg/appimage/appimage.sh b/pkg/appimage/appimagebuild similarity index 97% rename from pkg/appimage/appimage.sh rename to pkg/appimage/appimagebuild index bd1ce7511a1546f993309cbc868605b25bab5dd1..70d5f1b929f3917affa0edbe2b184c4cb6ff40ea 100644 --- a/pkg/appimage/appimage.sh +++ b/pkg/appimage/appimagebuild @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash PKGNAME='ocs-manager' PKGVER='0.5.5' @@ -8,7 +8,7 @@ curl -fsSL -o linuxdeployqt.AppImage https://github.com/probonopd/linuxdeployqt/ chmod 755 linuxdeployqt.AppImage ./linuxdeployqt.AppImage --appimage-extract -sh scripts/prepare.sh +sh scripts/prepare qmake PREFIX=/usr make make INSTALL_ROOT="${PKGNAME}.AppDir" install diff --git a/pkg/pkg.pri b/pkg/pkg.pri index 285c2e56f6e290a7be6dd4909629d9e5029e7245..5108e5256e6fc574d35c611bfa792f8b621cf681 100644 --- a/pkg/pkg.pri +++ b/pkg/pkg.pri @@ -1 +1 @@ -DISTFILES += $${PWD}/appimage/appimage.sh +DISTFILES += $${PWD}/appimage/appimagebuild diff --git a/scripts/package.sh b/scripts/package similarity index 95% rename from scripts/package.sh rename to scripts/package index f6e370542c41a3c9acbed7c1387fc65ab0d860e5..f2031fc3c9dd9db8285fad21d29d68f86fe9b4f3 100644 --- a/scripts/package.sh +++ b/scripts/package @@ -40,9 +40,9 @@ build_appimage() { mkdir -p "${BUILDDIR}" export_srcarchive "${BUILDDIR}/${PKGNAME}.tar.gz" tar -xzf "${BUILDDIR}/${PKGNAME}.tar.gz" -C "${BUILDDIR}" - cp "${PROJDIR}/pkg/appimage/appimage.sh" "${BUILDDIR}/${PKGNAME}" + cp "${PROJDIR}/pkg/appimage/appimagebuild" "${BUILDDIR}/${PKGNAME}" cd "${BUILDDIR}/${PKGNAME}" - sh appimage.sh + sh appimagebuild } export_srcarchive() { diff --git a/scripts/prepare.sh b/scripts/prepare similarity index 100% rename from scripts/prepare.sh rename to scripts/prepare diff --git a/scripts/scripts.pri b/scripts/scripts.pri index de6b1aab073ed7bf170e9b6c989264bf521db687..3422cff444f1c3a426652e1367c5a4999671d7ee 100644 --- a/scripts/scripts.pri +++ b/scripts/scripts.pri @@ -1,3 +1,3 @@ DISTFILES += \ - $${PWD}/package.sh \ - $${PWD}/prepare.sh + $${PWD}/package \ + $${PWD}/prepare