scripts: improve packaging scripts

diff --git a/scripts/make-distrofiles.sh b/scripts/make-distrofiles.sh
index 205787d8e53e1ceaa5da50daeb865c0798be56f3..957c0678fe2ce2adadd19cd93285e711d7d54ce3 100755 (executable)
--- a/scripts/make-distrofiles.sh
+++ b/scripts/make-distrofiles.sh
@@ -1,4 +1,5 @@
-#!/bin/bash -e
+#!/bin/bash
+set -o errexit -o nounset -o xtrace
 
 # Run with -s to include *.symbols files.
 

diff --git a/scripts/make-srpm.sh b/scripts/make-srpm.sh
index 760d865517b3f85caf5e1b6527fb3f5afe79af26..29fc8b30a2b746165404537f218cc0d6fd38ee66 100755 (executable)
--- a/scripts/make-srpm.sh
+++ b/scripts/make-srpm.sh
@@ -1,4 +1,5 @@
-#!/bin/bash -e
+#!/bin/bash
+set -o errexit -o nounset -o xtrace
 
 # Create a source rpm for Fedora/EPEL
 
@@ -7,6 +8,6 @@ scripts/make-archive.sh
 scripts/make-distrofiles.sh
 mv knot-resolver_*.orig.tar.xz distro/rpm/
 cd distro/rpm
-rpkg srpm
+rpkg srpm --outdir .
 mv *.src.rpm ../../
 mv *.tar.xz ../../