summaryrefslogtreecommitdiff
path: root/bin
diff options
context:
space:
mode:
authorMihai Moldovan <ionic@ionic.de>2015-02-05 19:11:29 +0100
committerMihai Moldovan <ionic@ionic.de>2015-02-05 19:11:29 +0100
commit0f51902f12b82b925facddf3fb460ba643eaf230 (patch)
tree0256db3106807392aa4e9a24d22cb00b1c136af0 /bin
parent5b9f538ffc1b338b452e9a46260db80346075622 (diff)
downloadbuildscripts-0f51902f12b82b925facddf3fb460ba643eaf230.tar.gz
buildscripts-0f51902f12b82b925facddf3fb460ba643eaf230.tar.bz2
buildscripts-0f51902f12b82b925facddf3fb460ba643eaf230.zip
bin/build-rpm-package: replace mock '--result path' with '--resultdir=path' and use more quoting.
Diffstat (limited to 'bin')
-rwxr-xr-xbin/build-rpm-package6
1 files changed, 3 insertions, 3 deletions
diff --git a/bin/build-rpm-package b/bin/build-rpm-package
index 235a741..ec96df9 100755
--- a/bin/build-rpm-package
+++ b/bin/build-rpm-package
@@ -225,7 +225,7 @@ build_packages() {
rm -f $PKGDIST/$l_DIST/$l_CODENAME/x86_64/build.log
if mock --buildsrpm \
-r ${l_DIST}-${l_CODENAME}-x86_64 \
- --result $PKGDIST/$l_DIST/$l_CODENAME/rpmbuild/SRPMS \
+ --resultdir="$PKGDIST/$l_DIST/$l_CODENAME/rpmbuild/SRPMS" \
--spec "$PKGDIST/$l_DIST/$l_CODENAME/$l_ARCH/rpmbuild/SOURCES/$PROJECT.spec" \
--sources "$PKGDIST/$l_DIST/$l_CODENAME/$l_ARCH/rpmbuild/SOURCES/"; then
cat "$PKGDIST/$l_DIST/$l_CODENAME/rpmbuild/SRPMS/build.log"
@@ -297,7 +297,7 @@ build_packages() {
sleep 30
done
ls $PKGDIST/$l_DIST/$l_CODENAME/$l_ARCH/rpmbuild/SRPMS/$PROJECT-$UPSTREAM_VERSION-$PKG_SRCRELEASE.$IS_RELEASE.git$DATE.$GITREV.$COMPONENT.*.src.rpm | while read srpm; do
- if mock -r ${l_DIST}-${l_CODENAME}-x86_64 --result $PKGDIST/$l_DIST/$l_CODENAME/x86_64 $srpm; then
+ if mock -r "${l_DIST}-${l_CODENAME}-x86_64" --resultdir="$PKGDIST/$l_DIST/$l_CODENAME/x86_64" "$srpm"; then
# copy and later sign source RPM
cp "$srpm" "$PKGDIST/$l_DIST/$l_CODENAME/SRPM/"
@@ -368,7 +368,7 @@ build_packages() {
done
rm -f $PKGDIST/$l_DIST/$l_CODENAME/i386/build.log
ls $PKGDIST/$l_DIST/$l_CODENAME/$l_ARCH/rpmbuild/SRPMS/$PROJECT-$UPSTREAM_VERSION-$PKG_SRCRELEASE.$IS_RELEASE.git$DATE.$GITREV.$COMPONENT.*.src.rpm | while read srpm; do
- if nice mock -r ${l_DIST}-${l_CODENAME}-i386 --result $PKGDIST/$l_DIST/$l_CODENAME/i386 "$srpm"; then
+ if nice mock -r "${l_DIST}-${l_CODENAME}-i386" --resultdir="$PKGDIST/$l_DIST/$l_CODENAME/i386" "$srpm"; then
# only copy and sign source RPM if necessary
SIGN_SRPM=0
if [ ! -e "$PKGDIST/$l_DIST/$l_CODENAME/SRPM/$(basename "$srpm")" ]; then