[game-data-packager] 02/13: quake: Fix tempfile cleanup

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to branch master
in repository game-data-packager.

commit f097e25c954e32c6b5608fa148eec75c44ea2f1a
Author: Simon McVittie <smcv at debian.org>
Date:   Sun Jan 4 19:27:04 2015 +0000

    quake: Fix tempfile cleanup
    
    - $WORKDIR/pak1.pak wasn't being removed (because it was a symlink)
    - the uppercase ID1 directory was not getting cleaned up
    
    We were getting this warning:
    
        rmdir: failed to remove `/tmp/game-data-packager.ikZf91': Directory not empty
        rmdir: failed to remove `/tmp/game-data-packager.ikZf91': Directory not empty
    
    [use rm -f to remove pak1.pak rather than messing about with test -h
    -smcv]
---
 supported/quake | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/supported/quake b/supported/quake
index 182a3da..3c09a06 100644
--- a/supported/quake
+++ b/supported/quake
@@ -385,9 +385,16 @@ common_method() {
         slipstream "$OUTFILE" "usr/share/games/quake/${folder}" \
             "$WORKDIR/pak0.pak" "$WORKDIR/pak1.pak"
     fi
-    [ -d "$WORKDIR/${folder}" ] && rm -rf "$WORKDIR/${folder}"
-    [ ! -f "$WORKDIR/pak1.pak" ] || rm "$WORKDIR/pak1.pak"
-    rm "$WORKDIR/pak0.pak"
+
+    # clean up
+    if [ -d "$WORKDIR/${folder}" ] ; then
+        rm -rf "$WORKDIR/${folder}"
+    elif [ -d "$WORKDIR/`echo "${folder}" | tr a-z A-Z`" ] ; then
+        # Remove uppercase version of our directory
+        rm -rf "$WORKDIR/`echo "${folder}" | tr a-z A-Z`"
+    fi
+    rm -f "$WORKDIR/pak0.pak"
+    rm -f "$WORKDIR/pak1.pak"
     rm -f "$WORKDIR/quake106.zip"
 }
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/game-data-packager.git