fix more bugs

diff --git a/all b/all
index b8dd693229bdf1bd69241d0e81c1d05018dc3969..d517457b05dc6b3750e92a9ef51d4961f418a1de 100755 (executable)
--- 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 77a4703c2147ecf6557c8a814830970dd84e86ec..aa4089c1273e42f1db5efa84ac899883a72bf2b1 100755 (executable)
--- 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"`