]> git.rm.cloudns.org Git - xonotic/xonotic.git/commitdiff
Revert "try being more verbose (DEBUG)"
authorRudolf Polzer <divVerent@xonotic.org>
Fri, 17 Jun 2011 20:18:10 +0000 (22:18 +0200)
committerRudolf Polzer <divVerent@xonotic.org>
Fri, 17 Jun 2011 20:18:10 +0000 (22:18 +0200)
This reverts commit b7c48a7e7bf1c034e30031b521e1cc22c0df3f6e.

misc/tools/cached-converter.sh

index 1c7051456ff69d1bbc4604b91e58d266a0fb3095..104b657d2bfd8188ff69264b1bb6e66f824c1546 100755 (executable)
@@ -121,8 +121,8 @@ cached()
        [ -z "$outfile2" ] || tempfile2="${name2%/*}/new-${name2##*/}"
        if [ -f "$name1" ] && { [ -z "$outfile2" ] || [ -f "$name2" ]; }; then
                selfprofile convert_copyoutput
-               case "$outfile1" in */*) mkdir -p "${outfile1%/*}"; esac && { ln -vf "$name1" "$outfile1" || { rm -f "$outfile1" && cp "$name1" "$outfile1"; }; }
-               [ -z "$outfile2" ] || { case "$outfile2" in */*) mkdir -p "${outfile2%/*}"; esac && { ln -vf "$name2" "$outfile2" || { rm -f "$outfile2" && cp "$name2" "$outfile2"; }; }; }
+               case "$outfile1" in */*) mkdir -p "${outfile1%/*}"; esac && { ln -f "$name1" "$outfile1" 2>/dev/null || { rm -f "$outfile1" && cp "$name1" "$outfile1"; }; }
+               [ -z "$outfile2" ] || { case "$outfile2" in */*) mkdir -p "${outfile2%/*}"; esac && { ln -f "$name2" "$outfile2" 2>/dev/null || { rm -f "$outfile2" && cp "$name2" "$outfile2"; }; }; }
                conv=true
        elif selfprofile convert_makeoutput; "$method" "$infile1" "$infile2" "$tempfile1" "$tempfile2" "$@"; then
                mv "$tempfile1" "$name1"