SliTaz Repositories

     1.1 --- a/linux/stuff/bundle	Thu Aug 17 18:51:03 2017 +0200
     1.2 +++ b/linux/stuff/bundle	Wed Aug 23 12:08:35 2017 +0200
     1.3 @@ -48,16 +48,26 @@
     1.4  	pos=$(($pos+${#2}+1))
     1.5  	shift 2
     1.6  	free=$((0x1F1 - 2 - $pos - $crc))
     1.7 -	p=1
     1.8  	while [ -n "$2" -a $free -ge ${#2} ]; do
     1.9 -		s=$((($(stat -c "%s" "$1")+511)/512))
    1.10 +		echo "$((($(stat -c "%s" "$1")+511)/512)) $1 $2"
    1.11 +		shift 2
    1.12 +	done | awk '
    1.13 +BEGIN { i=0 } { sz[i]=$1; fn[i]=$2; sub(".*"$2,""); me[i++]=$0 }
    1.14 +END {
    1.15 +  for (m=0, l=p=1; m<i; m++) {
    1.16 +    for (s=100000, j=0; j<i; j++) if (!lc[j] && sz[j]<s) s=sz[k=j];
    1.17 +    f2[m]=fn[k]; s2[m]=s; lc[k]=l; l+=s; l2[m]=p; p+=sz[m]
    1.18 +  }
    1.19 +  for (j=0; j<i; j++)
    1.20 +    print sz[j] " " lc[j] " " fn[j] " " s2[j] " " l2[j] " " f2[j] " " me[j]
    1.21 +}' |	while read s p file s2 p2 file2 entry ; do
    1.22 +		[ -z "$SORT_MENU" ] && file2=$file && s2=$s && p=$p2
    1.23  		x="$(printf '\\x%02x\\x%02x' $(($p % 256)) $(($p / 256)) )"
    1.24 -		echo -en "$x$2\0" | ddq bs=1 of="$out" seek=$pos conv=notrunc
    1.25 -		p=$(($p+$s))
    1.26 -		pos=$(($pos+2+${#2}+1))
    1.27 -		cat "$1" /dev/zero | ddq bs=512 count=$s >> "$out"
    1.28 +		echo -en "$x$entry\0" | ddq bs=1 of="$out" seek=$pos conv=notrunc
    1.29 +		pos=$(($pos+2+${#entry}+1))
    1.30 +		cat "$file2" /dev/zero | ddq bs=512 count=$s2 >> "$out"
    1.31  		if [ $crc -ne 0 ]; then
    1.32 -			x=$(cat "$1" /dev/zero | ddq bs=512 count=$s | od -v \
    1.33 +			x=$(cat "$file" /dev/zero | ddq bs=512 count=$s | od -v \
    1.34  			    -t u2 -w2 -An|awk '{i+=$0} END {print (i % 65536)}')
    1.35  			x="$(printf '\\x%02x\\x%02x' $(($x % 256)) $(($x / 256)) )"
    1.36  			echo -en "$x" | ddq bs=1 of="$out" seek=$pos conv=notrunc
    1.37 @@ -68,7 +78,6 @@
    1.38  		fi
    1.39  		shift 2
    1.40  	done
    1.41 -	[ -n "$2" ] && echo "Warning: skip $@" 1>&2 && exit 1
    1.42  elif [ -s "$2" ]; then
    1.43  	base_initrd=$((0x00300000))
    1.44  	size_initrd=$(stat -c %s "$2")