SliTaz Repositories

     1.1 --- a/tinyutils/slitaz-installer.sh	Thu Feb 21 20:30:22 2008 +0100
     1.2 +++ b/tinyutils/slitaz-installer.sh	Fri Feb 22 14:36:42 2008 +0100
     1.3 @@ -174,21 +174,30 @@
     1.4  	cd $TARGET_ROOT
     1.5  	( zcat rootfs.gz 2>/dev/null || lzma d rootfs.gz -so 2>/dev/null || \
     1.6  	  cat rootfs.gz ) | cpio -id
     1.7 -	if [ -f .usr.sqfs ]; then
     1.8 +	# remove link to cdrom
     1.9 +	[ -d cdrom ] && rmdir cdrom
    1.10 +	if [ -L usr ]; then
    1.11 +		rm usr
    1.12 +		mv ../rootcd/usr .
    1.13 +	fi
    1.14 +	# unpack /usr
    1.15 +	$sqfs="../rootcd/usr.sqfs"
    1.16 +	[ -f $sqfs ] || sqfs=".usr.sqfs"
    1.17 +	if [ -f $sqfs ]; then
    1.18  		echo -en "\nDécompression de /usr... "
    1.19 -		sbin/unsquashfs .usr.sqfs
    1.20 -		rm .usr.sqfs
    1.21 -		if [ -d squashfs-root/.moved ]; then
    1.22 -			( cd squashfs-root/.moved ; find * -print ) | \
    1.23 -			while read file; do
    1.24 -				[ -L "$file" ] || continue
    1.25 -				rm -f "$file"
    1.26 -				mv "squashfs-root/.moved/$file" "$file"
    1.27 -			done
    1.28 -			rm -rf squashfs-root/.moved
    1.29 -		fi
    1.30 -		mv squashfs-root/* usr
    1.31 -		rmdir squashfs-root
    1.32 +		rmdir usr
    1.33 +		sbin/unsquashfs -d usr $sqfs
    1.34 +		rm $sqfs
    1.35 +	fi
    1.36 +	if [ -d usr/.moved ]; then
    1.37 +		echo -en "\nRestoration des fichiers déplacés dans /usr... "
    1.38 +		( cd usr/.moved ; find * -print ) | \
    1.39 +		while read file; do
    1.40 +			[ -L "$file" ] || continue
    1.41 +			rm -f "$file"
    1.42 +			mv "usr/.moved/$file" "$file"
    1.43 +		done
    1.44 +		rm -rf usr/.moved
    1.45  	fi
    1.46  	echo ""
    1.47  	echo -n "Suppression des fichiers copiés..."