From 3909f2b01482ac69d7a70a1545fb0d3260c1a30d Mon Sep 17 00:00:00 2001
From: Akira Ohgaki <akiraohgaki@gmail.com>
Date: Wed, 8 Mar 2017 22:04:22 +0900
Subject: [PATCH] Fix for paths
---
scripts/build-docker.sh | 10 +++++-----
scripts/build.sh | 10 +++++-----
2 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/scripts/build-docker.sh b/scripts/build-docker.sh
index bffee55..2f207d7 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 f103287..0da0d39 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
--
GitLab