wok-current rev 5863

busybox: fix pre_install/post_install
author Pascal Bellard <pascal.bellard@slitaz.org>
date Mon Jul 19 16:46:09 2010 +0200 (2010-07-19)
parents 1bc38e51b3d9
children 81f4949c244c
files busybox-pam/receipt busybox/receipt
line diff
     1.1 --- a/busybox-pam/receipt	Mon Jul 19 16:34:13 2010 +0200
     1.2 +++ b/busybox-pam/receipt	Mon Jul 19 16:46:09 2010 +0200
     1.3 @@ -92,7 +92,7 @@
     1.4  	fi
     1.5  	answer=""
     1.6  	while read i ; do
     1.7 -		[ -e $1$i ] || continue
     1.8 +		[ -f $1$i ] || continue
     1.9  		if [ -z "$answer" ]; then
    1.10  			echo -n "Keep installed GNU utilities ? "
    1.11  			read answer
    1.12 @@ -101,7 +101,7 @@
    1.13  			*) break;;
    1.14  			esac
    1.15  		fi
    1.16 -		mv $1$i $1$i-busybox-install
    1.17 +		cp -a $1$i $1$i-busybox-install
    1.18  	done < $1$INSTALLED/$PACKAGE/files.list
    1.19  }
    1.20  
    1.21 @@ -110,7 +110,7 @@
    1.22  	local i
    1.23  	mv -f /etc/resolv.conf-busybox-install /etc/resolv.conf
    1.24  	while read i ; do
    1.25 -		[ -e $1$i-busybox-install ] || continue
    1.26 +		[ -f $1$i-busybox-install ] || continue
    1.27  		mv $1$i-busybox-install $1$i
    1.28  	done < $1$INSTALLED/$PACKAGE/files.list
    1.29  	chmod 4755 $1/bin/busybox
     2.1 --- a/busybox/receipt	Mon Jul 19 16:34:13 2010 +0200
     2.2 +++ b/busybox/receipt	Mon Jul 19 16:46:09 2010 +0200
     2.3 @@ -85,7 +85,7 @@
     2.4  	fi
     2.5  	answer=""
     2.6  	while read i ; do
     2.7 -		[ -e $1$i ] || continue
     2.8 +		[ -f $1$i ] || continue
     2.9  		if [ -z "$answer" ]; then
    2.10  			echo -n "Keep installed GNU utilities ? "
    2.11  			read -t 30 answer	# by default: keep
    2.12 @@ -94,7 +94,7 @@
    2.13  			*) ;;
    2.14  			esac
    2.15  		fi
    2.16 -		mv $1$i $1$i-busybox-install
    2.17 +		cp -a $1$i $1$i-busybox-install
    2.18  	done < $1$INSTALLED/$PACKAGE/files.list
    2.19  }
    2.20  
    2.21 @@ -103,7 +103,7 @@
    2.22  	local i
    2.23  	mv -f /etc/resolv.conf-busybox-install /etc/resolv.conf
    2.24  	while read i ; do
    2.25 -		[ -e $1$i-busybox-install ] || continue
    2.26 +		[ -f $1$i-busybox-install ] || continue
    2.27  		mv $1$i-busybox-install $1$i
    2.28  	done < $1$INSTALLED/$PACKAGE/files.list
    2.29  	chmod 4755 $1/bin/busybox