fix more bugs

This commit is contained in:
Rudolf Polzer 2011-12-03 15:42:40 +01:00
parent 65f84359fe
commit 0055d86f7c
2 changed files with 6 additions and 7 deletions

4
all
View File

@ -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 ../..

View File

@ -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"`