Merge pull request #50 from ocs-url/develop

Develop

README.md

-# ocs-url [![Build Status](https://travis-ci.org/ocs-url/ocs-url.svg?branch=master)](https://travis-ci.org/ocs-url/ocs-url)
+# ocs-url
+
+[![License: GPL v3](https://img.shields.io/badge/License-GPL%20v3-blue.svg)](https://www.gnu.org/licenses/gpl-3.0)
+[![Build Status](https://travis-ci.org/ocs-url/ocs-url.svg?branch=master)](https://travis-ci.org/ocs-url/ocs-url)
 
 An install helper program for items served on OpenCollaborationServices (OCS).
 

ocs-url.pro

+message("Please execute scripts/import.sh for build dependencies")
+
 TARGET = ocs-url
 
 TEMPLATE = app

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

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