diff --git a/pkg/appimage/appimage.sh b/pkg/appimage/appimage.sh index 46c1d79eb7a2c3a8a87dac04af61eccb21cb0df3..cdd18c86900e05856b39e8c1a035fa770ef412c5 100644 --- a/pkg/appimage/appimage.sh +++ b/pkg/appimage/appimage.sh @@ -4,12 +4,12 @@ PKGNAME='ocs-manager' PKGVER='0.5.4' 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 +curl -fsSL -o linuxdeployqt.AppImage https://github.com/probonopd/linuxdeployqt/releases/download/continuous/linuxdeployqt-continuous-x86_64.AppImage +chmod 755 linuxdeployqt.AppImage +./linuxdeployqt.AppImage --appimage-extract sh scripts/prepare.sh -qmake PREFIX="/usr" +qmake PREFIX=/usr make make INSTALL_ROOT="${PKGNAME}.AppDir" install diff --git a/scripts/build-docker.sh b/scripts/build-docker.sh index 4a1cac647c9da71e01ddbcec044e3d0425288536..4e0c39ad66079c114aa9153c40d5bce77eef3604 100644 --- a/scripts/build-docker.sh +++ b/scripts/build-docker.sh @@ -20,8 +20,8 @@ transfer_file() { if [ -f "${filepath}" ]; then filename="$(basename "${filepath}")" echo "Uploading ${filename}" >> "${TRANSFERLOG}" - curl -T "${filepath}" "https://transfer.sh/${filename}" >> "${TRANSFERLOG}" - echo "" >> "${TRANSFERLOG}" + curl -fsSL -T "${filepath}" "https://transfer.sh/${filename}" >> "${TRANSFERLOG}" + echo '' >> "${TRANSFERLOG}" fi } @@ -47,10 +47,9 @@ build_appimage() { apt -y install libssl-dev libcurl3 libcurl3-gnutls libcurl4-gnutls-dev libxpm-dev useradd -m ${PKGUSER} - export HOME="/home/${PKGUSER}" chown -R ${PKGUSER}:${PKGUSER} "${PROJDIR}" - su -c "source /opt/qt59/bin/qt59-env.sh && sh "${BUILDSCRIPT}" ${BUILDTYPE}" ${PKGUSER} + su -c "export HOME=/home/${PKGUSER} && source /opt/qt59/bin/qt59-env.sh && sh "${BUILDSCRIPT}" ${BUILDTYPE}" ${PKGUSER} transfer_file "$(find "${PROJDIR}/build_"*${BUILDTYPE} -type f -name "${PKGNAME}*.AppImage")" } diff --git a/scripts/build.sh b/scripts/build.sh index 36363d99ca74442c5152e8c9a27f0667205a7b3b..7cde6d6e74d5dccefc31eb376f44d7774e9dd0cd 100644 --- a/scripts/build.sh +++ b/scripts/build.sh @@ -25,7 +25,7 @@ build_appimage() { mkdir -p "${BUILDDIR}" export_srcarchive "${SRCARCHIVE}" - tar -xzvf "${SRCARCHIVE}" -C "${BUILDDIR}" + tar -xzf "${SRCARCHIVE}" -C "${BUILDDIR}" cp "${PROJDIR}/pkg/appimage/appimage.sh" "${BUILDDIR}/${PKGNAME}" cd "${BUILDDIR}/${PKGNAME}" sh appimage.sh