diff options
| author | François Andriot <albator78@libertysurf.fr> | 2014-02-01 14:56:14 +0100 |
|---|---|---|
| committer | François Andriot <albator78@libertysurf.fr> | 2014-02-01 14:56:14 +0100 |
| commit | ebd751a0a30522160af8d4e3e44cf88382c1567c (patch) | |
| tree | 5dc3776fdaa3a01de8015b8f1ab12bbc03efc432 /redhat/genrpm.sh | |
| parent | 2684939e2168b39190416af1601f3e1830771064 (diff) | |
| download | tde-packaging-ebd751a0a30522160af8d4e3e44cf88382c1567c.tar.gz tde-packaging-ebd751a0a30522160af8d4e3e44cf88382c1567c.zip | |
RPM Packaging: update build scripts
Diffstat (limited to 'redhat/genrpm.sh')
| -rwxr-xr-x | redhat/genrpm.sh | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/redhat/genrpm.sh b/redhat/genrpm.sh index d8d7bd3a3..18857cf1a 100755 --- a/redhat/genrpm.sh +++ b/redhat/genrpm.sh @@ -30,7 +30,7 @@ else #eval TARBALLS_DIR=~/tde/tde-tarballs/14.0.0 fi -clear +#clear cat <<EOF $(< /etc/redhat-release) [$(uname -m)] This script generates RPM of TDE from source tarball. @@ -123,8 +123,6 @@ About to build '${COMP}': Spec file: '${SPEC}' Tarball: '${TARBALL}' -CCACHE_DIR='${CCACHE_DIR}' - Press ENTER to build, or CTRL+C to abort. EOF [ -z "${AUTO}" ] && read rep @@ -191,7 +189,6 @@ rpmbuild -ba \ echo "RET=$?" ) 2>&1 | tee ${LOGFILE} eval "$(grep ^RET= ${LOGFILE})" -set +x # Removes temporary source directory rm -rf "${SOURCEDIR}" @@ -199,6 +196,7 @@ rm -rf "${SOURCEDIR}" if [ "${RET}" -gt 0 ]; then exit ${RET} fi +set +x if grep -q "error: Failed build dependencies:" ${LOGFILE}; then # DEPS=$( sed -n -e "/.* is needed by .*/ s/^[ \t]*\([a-zA-Z2-9_-]*\) .*/\1/p" ${LOGFILE} ) |