diff --git a/.travis.yml b/.travis.yml index 00353ed0fbd8646223d907f28fe5c641ad795b94..87a1032ff1a7cc6727a39620de06d684c6f59291 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 ci_appimage" + - docker run --rm -v $(pwd):${mntdir} ubuntu:14.04 /bin/bash -c "${mntdir}/scripts/package ci_appimage" - cat transfer.log diff --git a/pkg/appimage/appimagebuild b/pkg/appimage/appimagebuild old mode 100644 new mode 100755 index 70d5f1b929f3917affa0edbe2b184c4cb6ff40ea..d9e03a9ed51270b2cdb02028790d218d3bb26373 --- a/pkg/appimage/appimagebuild +++ b/pkg/appimage/appimagebuild @@ -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 +./scripts/prepare qmake PREFIX=/usr make make INSTALL_ROOT="${PKGNAME}.AppDir" install diff --git a/scripts/package b/scripts/package old mode 100644 new mode 100755 index f2031fc3c9dd9db8285fad21d29d68f86fe9b4f3..7038fc43a0d9d6947da8f0a33f7b94c1296e1946 --- a/scripts/package +++ b/scripts/package @@ -30,7 +30,7 @@ ci_appimage() { # docker-image: ubuntu:14.04 useradd -m ${PKGUSER} chown -R ${PKGUSER} "${PROJDIR}" - su -c "export HOME=/home/${PKGUSER} && source /opt/qt59/bin/qt59-env.sh && sh "${PKGSCRIPT}" build_appimage" ${PKGUSER} + su -c "export HOME=/home/${PKGUSER} && source /opt/qt59/bin/qt59-env.sh && "${PKGSCRIPT}" build_appimage" ${PKGUSER} transfer_file "$(find "${BUILDDIR}" -type f -name "${PKGNAME}*.AppImage")" } @@ -42,7 +42,7 @@ build_appimage() { tar -xzf "${BUILDDIR}/${PKGNAME}.tar.gz" -C "${BUILDDIR}" cp "${PROJDIR}/pkg/appimage/appimagebuild" "${BUILDDIR}/${PKGNAME}" cd "${BUILDDIR}/${PKGNAME}" - sh appimagebuild + ./appimagebuild } export_srcarchive() { diff --git a/scripts/prepare b/scripts/prepare old mode 100644 new mode 100755