From 0055d86f7c466b178fd1f464552496a2ae34ed31 Mon Sep 17 00:00:00 2001 From: Rudolf Polzer Date: Sat, 3 Dec 2011 15:42:40 +0100 Subject: [PATCH] fix more bugs --- all | 4 ++-- misc/tools/cached-converter.sh | 9 ++++----- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/all b/all index b8dd6932..d517457b 100755 --- a/all +++ b/all @@ -1952,8 +1952,8 @@ case "$cmd" in release_timereport "processed data" verbose "$SELF" release-buildpk3-transform-$transform "Xonotic/temp" release_timereport "transformed data" - #find . -type f -size +4k | verbose "$d0"/misc/tools/symlink-deduplicate.sh - #release_timereport "deduplicated data" + find . -type f -size +4k | verbose "$d0"/misc/tools/symlink-deduplicate.sh + release_timereport "deduplicated data" verbose mkzipr "../../$dst" * release_timereport "zipped data" verbose cd ../.. diff --git a/misc/tools/cached-converter.sh b/misc/tools/cached-converter.sh index 77a4703c..aa4089c1 100755 --- a/misc/tools/cached-converter.sh +++ b/misc/tools/cached-converter.sh @@ -66,9 +66,9 @@ use_magnet_to_acquire_checksum_faster() if [ -n "$magnet" ]; then magnet=${magnet#* } magnet=${magnet%% *} - sum=$sum$magnet + echo "$magnet" else - sum=$sum`git hash-object "$1"` + git hash-object "$1" fi } @@ -88,10 +88,9 @@ acquire_checksum() esac done if [ -n "$git_src_repo" ] && ! $_a_e; then - _a_s= - use_magnet_to_acquire_checksum_faster "${1#./}" + _a_s=`use_magnet_to_acquire_checksum_faster "${1#./}"` if [ -n "$2" ]; then - use_magnet_to_acquire_checksum_faster "${2#./}" + _a_s=$_a_s`use_magnet_to_acquire_checksum_faster "${2#./}"` fi else _a_s=`git hash-object "$1"` -- 2.39.2