diff options
| author | Mihai Moldovan <ionic@ionic.de> | 2015-04-03 03:06:32 +0200 |
|---|---|---|
| committer | Mihai Moldovan <ionic@ionic.de> | 2015-04-03 03:06:32 +0200 |
| commit | 4d5b678512f675f3bfb00e08c3378d4658cf71e9 (patch) | |
| tree | 7f348834e9990520051b759ec4b0f7925828f05e | |
| parent | 7b64a61a4fb5918191094c03a7932eb2a1d316ac (diff) | |
| download | buildscripts-4d5b678512f675f3bfb00e08c3378d4658cf71e9.tar.gz buildscripts-4d5b678512f675f3bfb00e08c3378d4658cf71e9.tar.bz2 buildscripts-4d5b678512f675f3bfb00e08c3378d4658cf71e9.zip | |
bin/build-rpm-package: merge ${temp_cleanup} changes from bin/build-deb-package.
| -rwxr-xr-x | bin/build-rpm-package | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/bin/build-rpm-package b/bin/build-rpm-package index 6b30126..eccfd7e 100755 --- a/bin/build-rpm-package +++ b/bin/build-rpm-package @@ -61,6 +61,7 @@ test -f "${HOME}/.buildscripts/${PREFIX}.conf" && . "${HOME}/.buildscripts/${PRE TMP_MOCK_CFG_DIR="" TMP_MOCK_CFG_FILE="" TEMP_BASE="${HOME}/tmp/" +typeset -ag temp_cleanup # End of non-user-serviceable part. set -ex @@ -103,6 +104,14 @@ cleanup () { else echo "Warning: mock temporary config directory not defined. Skipping cleanup." >&2 fi + + # Cleanup the other temporary dirs afterwards. + typeset temp_dir="" + for temp_dir in "${temp_cleanup[@]}"; do + if [ -n "${temp_dir}" ] && [ -d "${temp_dir}" ]; then + rm -Rf -- "${temp_dir}" + fi + done } # Run cleanup() automatically. @@ -593,6 +602,7 @@ build_packages() { # tar upstream sources from our Git clone TEMP_DIR="$(mktemp -d --tmpdir="${TEMP_BASE}")" + temp_cleanup+=("${TEMP_DIR}") mkdir -p -- "${TEMP_DIR}/${PROJECT}" chmod -Rf -- 2770 "${TEMP_DIR}" |