From: Rudolf Polzer Date: Fri, 17 Jun 2011 20:18:10 +0000 (+0200) Subject: Revert "try being more verbose (DEBUG)" X-Git-Tag: xonotic-v0.5.0~69 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=e7b63a466d03773867c282a82f06e4f83611673c;p=xonotic%2Fxonotic.git Revert "try being more verbose (DEBUG)" This reverts commit b7c48a7e7bf1c034e30031b521e1cc22c0df3f6e. --- diff --git a/misc/tools/cached-converter.sh b/misc/tools/cached-converter.sh index 1c705145..104b657d 100755 --- a/misc/tools/cached-converter.sh +++ b/misc/tools/cached-converter.sh @@ -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"