diff options
| author | Allan McRae <allan@archlinux.org> | 2009-03-26 01:29:15 +1000 |
|---|---|---|
| committer | Allan McRae <allan@archlinux.org> | 2009-03-26 01:39:13 +1000 |
| commit | 7370fd595bc0447e7c17135e3a27cc3ae64015d4 (patch) | |
| tree | 2fca98a69bf48fff61239fdd086d1e23ded4931e | |
| parent | 4c27a776bd6287d6022a014d4d87ebe6ec6c75f9 (diff) | |
| download | pacman-7370fd595bc0447e7c17135e3a27cc3ae64015d4.tar.xz | |
makepkg: adjust log clean-up for new filenames
The log files now have -build or -package at the end and there
are separate log files for each *_package() function. Alter
clean_up() to deal with this. Also, move glob outside quotes so
this actually works.
Signed-off-by: Allan McRae <allan@archlinux.org>
| -rw-r--r-- | scripts/makepkg.sh.in | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 95ee5200..ff2663b8 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -155,7 +155,14 @@ clean_up() { rm -rf "$pkgdir" "$srcdir" if [ -n "$pkgname" ]; then # Can't do this unless the BUILDSCRIPT has been sourced. - rm -f "${pkgname}-${pkgver}-${pkgrel}-${CARCH}.log*" + rm -f "${pkgbase}-${pkgver}-${pkgrel}-${CARCH}-build.log"* + if [ "$PKGFUNC" -eq 1 ]; then + rm -f "${pkgbase}-${pkgver}-${pkgrel}-${CARCH}-package.log"* + elif [ "$SPLITPKG" -eq 1 ]; then + for pkg in ${pkgname[@]}; do + rm -f "${pkg}-${pkgver}-${pkgrel}-${CARCH}-package.log"* + done + fi fi fi |