SliTaz Repositories

     1.1 --- a/tazlito	Wed Jan 15 09:25:11 2014 +0100
     1.2 +++ b/tazlito	Wed Jan 15 13:15:16 2014 +0000
     1.3 @@ -359,15 +359,15 @@
     1.4  {
     1.5  	if [ "$COMPRESSION" = "lzma" ]; then
     1.6  		echo -n "Creating rootfs.gz with lzma compression... "
     1.7 -		cat /tmp/list | cpio -o -H newc | lzma e -si -so > /rootfs.gz
     1.8 +		cpio -o -H newc | lzma e -si -so > /rootfs.gz
     1.9  		lzma_set_size /rootfs.gz
    1.10  	elif [ "$COMPRESSION" = "gzip" ]; then
    1.11  		echo "Creating rootfs.gz with gzip compression... "
    1.12 -		cat /tmp/list | cpio -o -H newc | gzip -9 > /rootfs.gz
    1.13 +		cpio -o -H newc | gzip -9 > /rootfs.gz
    1.14  	else
    1.15  		echo "Creating rootfs.gz without compression... "
    1.16 -		cat /tmp/list | cpio -o -H newc > /rootfs.gz
    1.17 -	fi
    1.18 +		cpio -o -H newc > /rootfs.gz
    1.19 +	fi < /tmp/list
    1.20  	align_to_32bits /rootfs.gz
    1.21  	echo 1 > /tmp/rootfs
    1.22  }
    1.23 @@ -953,6 +953,7 @@
    1.24  	for i in $TMP_DIR/initfs/lib/modules/*z ; do
    1.25  		unxz $i || gunzip $i || lzma d $i ${i%.gz}
    1.26  		rm -f $i
    1.27 +		gzip -9 ${i%.gz}
    1.28  	done 2> /dev/null
    1.29  	( cd $TMP_DIR/initfs ; find | busybox cpio -o -H newc 2> /dev/null) | \
    1.30  	lzma e $TMP_DIR/initfs.gz -si
    1.31 @@ -1110,7 +1111,7 @@
    1.32  	cat $1$INSTALLED/*/md5sum | \
    1.33  	while read md5 file; do
    1.34  		[ -e $1$file ] || continue
    1.35 -		[ "$(cat $1$file | md5sum)" == "$md5  -" ] &&
    1.36 +		[ "$(md5sum < $1$file)" == "$md5  -" ] &&
    1.37  		rm -f $1$file
    1.38  	done
    1.39  
    1.40 @@ -1506,7 +1507,7 @@
    1.41  			mv -f $TMP_DIR/$FLAVOR.pkglist.$$ $TMP_DIR/$FLAVOR.pkglist
    1.42  			if [ -s $TMP_DIR/$FLAVOR.rootfs ]; then
    1.43  				packed_size=$(($packed_size \
    1.44 -					+ $(cat $TMP_DIR/$FLAVOR.rootfs | wc -c ) / 100 ))
    1.45 +					+ $(wc -c < $TMP_DIR/$FLAVOR.rootfs) / 100 ))
    1.46  				unpacked_size=$(($unpacked_size \
    1.47  					+ $(zcat < $TMP_DIR/$FLAVOR.rootfs | wc -c ) / 100 ))
    1.48  			fi
    1.49 @@ -1659,7 +1660,7 @@
    1.50  			fi
    1.51  			if [ -s $TMP_DIR/$FLAVOR.rootfs ]; then
    1.52  				packed_size=$(($packed_size \
    1.53 -					+ $(cat $TMP_DIR/$FLAVOR.rootfs | wc -c ) / 100 ))
    1.54 +					+ $(wc -c < $TMP_DIR/$FLAVOR.rootfs) / 100 ))
    1.55  				unpacked_size=$(($unpacked_size \
    1.56  					+ $(zcat < $TMP_DIR/$FLAVOR.rootfs | wc -c ) / 100 ))
    1.57  			fi
    1.58 @@ -1768,7 +1769,7 @@
    1.59  				sed 's/.*: \(.*\)$/\1/' > /etc/tazlito/rootfs.list
    1.60  			echo -n "Updating tazlito.conf..."
    1.61  			[ -f tazlito.conf ] || cp /etc/tazlito/tazlito.conf .
    1.62 -			cat tazlito.conf | grep -v "^#VOLUM_NAME" | \
    1.63 +			grep -v "^#VOLUM_NAME" < tazlito.conf | \
    1.64  			sed "s/^VOLUM_NA/VOLUM_NAME=\"SliTaz $FLAVOR\"\\n#VOLUM_NA/" \
    1.65  				> tazlito.conf.$$ && mv tazlito.conf.$$ tazlito.conf
    1.66  			sed -i "s/ISO_NAME=.*/ISO_NAME=\"slitaz-$FLAVOR\"/" tazlito.conf
    1.67 @@ -2378,8 +2379,8 @@
    1.68  		# Guess cdrom device, ask user and burn the ISO.
    1.69  		#
    1.70  		check_root
    1.71 -		DRIVE_NAME=`cat /proc/sys/dev/cdrom/info | grep "drive name" | cut -f 3`
    1.72 -		DRIVE_SPEED=`cat /proc/sys/dev/cdrom/info | grep "drive speed" | cut -f 3`
    1.73 +		DRIVE_NAME=$(grep "drive name" < /proc/sys/dev/cdrom/info | cut -f 3)
    1.74 +		DRIVE_SPEED=$(grep "drive speed" < /proc/sys/dev/cdrom/info | cut -f 3)
    1.75  		# We can specify an alternative ISO from the cmdline.
    1.76  		if [ -n "$2" ] ; then
    1.77  			iso=$2
    1.78 @@ -2535,7 +2536,7 @@
    1.79  		fi
    1.80  		mkdir -p $TMP_DIR/iso
    1.81  		mount -o loop,ro -t iso9660 $ISO $TMP_DIR/iso
    1.82 -		loopdev=$($(losetup -a 2>/dev/null || losetup) | grep $ISO | cut -d: -f1)
    1.83 +		loopdev=$( (losetup -a 2>/dev/null || losetup) | grep $ISO | cut -d: -f1)
    1.84  		if ! check_iso_for_loram ; then
    1.85  			echo "$2 is not a valid SliTaz live CD. Abort."
    1.86  			umount -d $TMP_DIR/iso