From: Rudolf Polzer <divVerent@xonotic.org>
Date: Fri, 27 May 2011 09:35:51 +0000 (+0200)
Subject: some fixes for cached converter
X-Git-Tag: xonotic-v0.5.0~81
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=30a56f6f618f229b60ee23312b3c18587e1ae23e;p=xonotic%2Fxonotic.git

some fixes for cached converter
---

diff --git a/misc/tools/cached-converter.sh b/misc/tools/cached-converter.sh
index d59ff8a0..2bcaacb2 100755
--- a/misc/tools/cached-converter.sh
+++ b/misc/tools/cached-converter.sh
@@ -52,15 +52,15 @@ cached()
 		evil=false
 		for infile in "$infile1" "$infile2"; do
 			case "$infile" in
-				*/background_l2.tga)
+				*/background_l2.tga|*/background_ingame_l2.tga)
 					evil=true
 					;;
 			esac
 		done
 		if [ -n "$git_src_repo" ] && ! $evil; then
-			sum=`( cd "$git_src_repo"; git rev-parse --revs-only HEAD:"${infile1#./}" | grep . ) || git hash-object "$infile1"`
+			sum=`( cd "$git_src_repo"; git rev-parse --revs-only HEAD:"${infile1#./}" | grep . ) || { echo >&2 "git-rev-parse failed on $infile1"; git hash-object "$infile1"; }`
 			if [ -n "$infile2" ]; then
-				sum=$sum`( cd "$git_src_repo"; git rev-parse --revs-only HEAD:"${infile2#./}" | grep . ) || git hash-object "$infile2"`
+				sum=$sum`( cd "$git_src_repo"; git rev-parse --revs-only HEAD:"${infile2#./}" | grep . ) || { echo >&2 "git-rev-parse failed on $infile2"; git hash-object "$infile2"; }`
 			fi
 		else
 			sum=`git hash-object "$infile1"`