]> git.xonotic.org Git - xonotic/xonotic.git/commitdiff
some fixes for cached converter
authorRudolf Polzer <divVerent@xonotic.org>
Fri, 27 May 2011 09:35:51 +0000 (11:35 +0200)
committerRudolf Polzer <divVerent@xonotic.org>
Fri, 27 May 2011 09:35:51 +0000 (11:35 +0200)
misc/tools/cached-converter.sh

index d59ff8a03d5f88b0dc8c70d8f700e1fe10d6630c..2bcaacb2373d153533679e3cb4a98f07e979060e 100755 (executable)
@@ -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"`