From: Jānis Rūcis <parasti@gmail.com>
Date: Mon, 16 Aug 2010 12:36:19 +0000 (+0300)
Subject: import-pk3: use a separate index file
X-Git-Tag: xonotic-v0.1.0preview~292^2~3
X-Git-Url: http://git.xonotic.org/?p=xonotic%2Fxonotic.git;a=commitdiff_plain;h=5fc7e504cec89ceec6ddbb37c326e74fe3d4e705

import-pk3: use a separate index file
---

diff --git a/misc/tools/git-import-pk3 b/misc/tools/git-import-pk3
index a2c243a4..f9680ac7 100755
--- a/misc/tools/git-import-pk3
+++ b/misc/tools/git-import-pk3
@@ -66,11 +66,29 @@ message()
     echo -e "Import $pk3name\n" | cat - "$changes" 2> /dev/null
 }
 
+# Clean up on exit
+
+cleanup_index=
+cleanup_worktree=
+
+cleanup()
+{
+    [ "$cleanup_index" ] && rm -f "$GIT_INDEX_FILE"
+    [ "$cleanup_worktree" ] && find "$GIT_WORK_TREE" -mindepth 1 -delete
+}
+
+trap cleanup EXIT
+
+# Set up index file, makes testing easier
+[ -z "$GIT_INDEX_FILE" ] && {
+    export GIT_INDEX_FILE="$GIT_DIR/import-pk3-index"
+    cleanup_index=t
+}
+
 # Extract the PK3 (the -n suppresses prompting in an edge case)
-# FIXME: perhaps the caller should handle extraction and clean up
 unzip -n -qq "$pk3path" -d "$GIT_WORK_TREE" ||
 die "couldn't extract PK3 contents"
-trap 'find "$GIT_WORK_TREE" -mindepth 1 -delete' EXIT
+cleanup_worktree=t
 
 # Note the refs and the common ancestor
 master=refs/heads/master