diff --git a/build-in-docker.sh b/build-in-docker.sh index 0c27665..e373f49 100755 --- a/build-in-docker.sh +++ b/build-in-docker.sh @@ -273,10 +273,7 @@ EOF ifthenelse "${repo}" "${INSTALL_REPO} ARG" ((++i)) done - TGZFILE=$(grep PACKAGE_STRING= configure | sed "s, ,-,g;s,PACKAGE_STRING=',,g;s,',.tar.gz,g") - touch $TGZFILE docker exec ${DOCKER_ID} ./resolve-rpmbuilddeps.sh - rm $TGZFILE ;; esac docker exec -u $(id -u):$(id -g) ${DOCKER_ID} ./bootstrap.sh -t "${targets}" diff --git a/resolve-rpmbuilddeps.sh b/resolve-rpmbuilddeps.sh index 165ef0c..1ed2408 100755 --- a/resolve-rpmbuilddeps.sh +++ b/resolve-rpmbuilddeps.sh @@ -24,7 +24,7 @@ fi TGZFILE=$(sed -n '/^Name: */{s///;h};/^Version: */{s///;H;x;s/\n/-/;s/$/.tar.gz/;p}' ${PACKAGE_NAME}.spec) if ! test -e $TGZFILE; then - TRAP_CMD+="${TGZFILE};" + TRAP_CMD+="rm ${TGZFILE};" trap "${TRAP_CMD}" INT TERM EXIT touch $TGZFILE fi