diff --git a/README.md b/README.md index 8ba67e23cbdba7ea182b5b66956c8017de73b044..26e2ebc72623cad94b455e1f0cb2419c9f3930b0 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,7 @@ -# ocs-url [](https://travis-ci.org/ocs-url/ocs-url) +# ocs-url + +[](https://www.gnu.org/licenses/gpl-3.0) +[](https://travis-ci.org/ocs-url/ocs-url) An install helper program for items served on OpenCollaborationServices (OCS). diff --git a/ocs-url.pro b/ocs-url.pro index a1237d1155a480d9d9d8a822efd8122c449c0e95..79396ec30b19855a38c01b45430aada70795700f 100644 --- a/ocs-url.pro +++ b/ocs-url.pro @@ -1,3 +1,5 @@ +message("Please execute scripts/import.sh for build dependencies") + TARGET = ocs-url TEMPLATE = app diff --git a/scripts/build-docker.sh b/scripts/build-docker.sh index bffee55e87bbeacd10cd7a34ac6039e5094043ce..2f207d7e2d06271252fb01ac55a9d7478c3dce78 100644 --- a/scripts/build-docker.sh +++ b/scripts/build-docker.sh @@ -26,7 +26,7 @@ build_ubuntu() { export HOME="/home/${PKGUSER}" chown -R ${PKGUSER}:${PKGUSER} "${PROJDIR}" - su -c "sh ${BUILDSCRIPT} ${BUILDTYPE}" ${PKGUSER} + su -c "sh "${BUILDSCRIPT}" ${BUILDTYPE}" ${PKGUSER} } build_fedora() { @@ -43,7 +43,7 @@ build_fedora() { export HOME="/home/${PKGUSER}" chown -R ${PKGUSER}:${PKGUSER} "${PROJDIR}" - su -c "sh ${BUILDSCRIPT} ${BUILDTYPE}" ${PKGUSER} + su -c "sh "${BUILDSCRIPT}" ${BUILDTYPE}" ${PKGUSER} } build_archlinux() { @@ -56,7 +56,7 @@ build_archlinux() { export HOME="/home/${PKGUSER}" chown -R ${PKGUSER}:${PKGUSER} "${PROJDIR}" - su -c "sh ${BUILDSCRIPT} ${BUILDTYPE}" ${PKGUSER} + su -c "sh "${BUILDSCRIPT}" ${BUILDTYPE}" ${PKGUSER} } build_snap() { @@ -70,7 +70,7 @@ build_snap() { export HOME="/home/${PKGUSER}" chown -R ${PKGUSER}:${PKGUSER} "${PROJDIR}" - su -c "sh ${BUILDSCRIPT} ${BUILDTYPE}" ${PKGUSER} + su -c "sh "${BUILDSCRIPT}" ${BUILDTYPE}" ${PKGUSER} } build_appimage() { @@ -86,7 +86,7 @@ build_appimage() { export HOME="/home/${PKGUSER}" chown -R ${PKGUSER}:${PKGUSER} "${PROJDIR}" - su -c "sh ${BUILDSCRIPT} ${BUILDTYPE}" ${PKGUSER} + su -c "sh "${BUILDSCRIPT}" ${BUILDTYPE}" ${PKGUSER} } if [ "${BUILDTYPE}" = 'ubuntu' ]; then diff --git a/scripts/build.sh b/scripts/build.sh index f1032877db77c9f63509716d124c93adad32f305..0da0d39dbcb2f35697174a874f14349b2d5bad95 100644 --- a/scripts/build.sh +++ b/scripts/build.sh @@ -43,7 +43,7 @@ build_ubuntu() { cd "${BUILDDIR}/${PKGNAME}" debuild -uc -us -b - transfer_file "$(find ${BUILDDIR} -type f -name "${PKGNAME}*.deb")" + transfer_file "$(find "${BUILDDIR}" -type f -name "${PKGNAME}*.deb")" } build_fedora() { @@ -57,7 +57,7 @@ build_fedora() { cp "${PROJDIR}/pkg/fedora/${PKGNAME}.spec" "${BUILDDIR}/SPECS" rpmbuild --define "_topdir ${BUILDDIR}" -bb "${BUILDDIR}/SPECS/${PKGNAME}.spec" - transfer_file "$(find ${BUILDDIR} -type f -name "${PKGNAME}*.rpm")" + transfer_file "$(find "${BUILDDIR}" -type f -name "${PKGNAME}*.rpm")" } build_archlinux() { @@ -70,7 +70,7 @@ build_archlinux() { updpkgsums makepkg -s - transfer_file "$(find ${BUILDDIR} -type f -name "${PKGNAME}*.pkg.tar.xz")" + transfer_file "$(find "${BUILDDIR}" -type f -name "${PKGNAME}*.pkg.tar.xz")" } build_snap() { @@ -84,7 +84,7 @@ build_snap() { cd "${BUILDDIR}/${PKGNAME}" snapcraft - transfer_file "$(find ${BUILDDIR} -type f -name "${PKGNAME}*.snap")" + transfer_file "$(find "${BUILDDIR}" -type f -name "${PKGNAME}*.snap")" } build_appimage() { @@ -119,7 +119,7 @@ build_appimage() { ./linuxdeployqt --appimage-extract ./squashfs-root/usr/bin/appimagetool "${BUILDDIR}/${PKGNAME}.AppDir" - transfer_file "$(find ${BUILDDIR} -type f -name "${PKGNAME}*.AppImage")" + transfer_file "$(find "${BUILDDIR}" -type f -name "${PKGNAME}*.AppImage")" } if [ "${BUILDTYPE}" = 'ubuntu' ]; then