From e6c9c46a7d22f5bcb9da872b4860c164e0a24cbc Mon Sep 17 00:00:00 2001
From: Anders Blomdell <anders.blomdell@control.lth.se>
Date: Thu, 19 Apr 2018 20:10:27 +0200
Subject: [PATCH] Sanitize package creation script
---
rust-package.sh | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/rust-package.sh b/rust-package.sh
index d58b176..a3c62d9 100755
--- a/rust-package.sh
+++ b/rust-package.sh
@@ -1,8 +1,9 @@
#!/bin/bash
-set -x
set -e
+TARGET="-t plain"
+
POSITIONAL=()
while [ $# -gt 0 ] ; do
case $1 in
@@ -25,13 +26,15 @@ set -- "${POSITIONAL[@]}" # restore positional parameters
NAME=${POSITIONAL[0]}
rust2rpm ${PATCH} ${TARGET} ${POSITIONAL[@]}
+sed -i -re 's/(BuildRequires:\s*)\((crate[\(][^\)]+\)).*/&\n\1\2/' \
+ rust-${NAME}.spec
DOWNLOAD=$(rpmspec -P rust-${NAME}.spec \
| grep Source0 \
| sed -re 's/^Source0:\s+(.*)$/\1/')
-curl -L ${DOWNLOAD} > /usr/src/andersb/rpmbuild/SOURCES/$(basename ${DOWNLOAD})
+curl -L ${DOWNLOAD} > ${HOME}/rpmbuild/SOURCES/$(basename ${DOWNLOAD})
if [ -n "${PATCH}" ] ; then
DIFF=$(basename ${DOWNLOAD} | sed -e 's/.crate//')-fix-metadata.diff
- cp ${DIFF} /usr/src/andersb/rpmbuild/SOURCES/
+ cp ${DIFF} ${HOME}/rpmbuild/SOURCES/
fi
-rpmbuild -bs rust-${NAME}.spec
rpmbuild -bb rust-${NAME}.spec
+rpmbuild -bs rust-${NAME}.spec
--
GitLab