# HG changeset patch
# User Pascal Bellard <pascal.bellard@slitaz.org>
# Date 1224578926 0
# Node ID 52ca9fcdca282748e3477283a9d6c0691196eae8
# Parent  6f21be70783b8a016dcb92ec1be52bcb6a63ddd6
slitaz-loram*: do not assume files are in /usr/bin

diff -r 6f21be70783b -r 52ca9fcdca28 slitaz-loram-cdrom/stuff/loram.extract
--- a/slitaz-loram-cdrom/stuff/loram.extract	Mon Oct 20 21:19:09 2008 +0000
+++ b/slitaz-loram-cdrom/stuff/loram.extract	Tue Oct 21 08:48:46 2008 +0000
@@ -1,6 +1,5 @@
 # remove link to cdrom
 [ -d cdrom ] && rmdir cdrom
-rm -f bin/vcsa2txt bin/awk bin/script bin/cut bin/readlink bin/du bin/free
 if [ -L usr ]; then
 	rm usr
 	cp -a $1/usr .
@@ -44,3 +43,6 @@
 	sed -i 's/CLEAN_UP_SYSTEM="no"/CLEAN_UP_SYSTEM="yes"/' etc/rcS.conf
 	sed -i 's/RUN_DAEMONS="/RUN_DAEMONS="slim /' etc/rcS.conf
 fi
+for ii in bin/vcsa2txt bin/awk bin/script bin/cut bin/readlink bin/du bin/free; do
+	[ -e usr/$ii ] && rm -f $ii
+done
diff -r 6f21be70783b -r 52ca9fcdca28 slitaz-loram-cdrom/stuff/loram.rootfs
--- a/slitaz-loram-cdrom/stuff/loram.rootfs	Mon Oct 20 21:19:09 2008 +0000
+++ b/slitaz-loram-cdrom/stuff/loram.rootfs	Tue Oct 21 08:48:46 2008 +0000
@@ -90,7 +90,7 @@
 EOT
 fi
 for ii in bin/vcsa2txt bin/awk bin/script bin/cut bin/readlink bin/du bin/free; do
-  ln -s busybox $ii
+  [ -e $ii ] || ln -s busybox $ii
 done
 mkdir cdrom
 COMPRESSION="gzip"
diff -r 6f21be70783b -r 52ca9fcdca28 slitaz-loram-http/stuff/loram.extract
--- a/slitaz-loram-http/stuff/loram.extract	Mon Oct 20 21:19:09 2008 +0000
+++ b/slitaz-loram-http/stuff/loram.extract	Tue Oct 21 08:48:46 2008 +0000
@@ -1,6 +1,5 @@
 # remove link to cdrom
 [ -d cdrom ] && rmdir cdrom
-rm -f bin/vcsa2txt bin/awk bin/script bin/cut bin/readlink bin/du bin/free
 if [ -L usr ]; then
 	rm usr
 	cp -a $1/usr .
@@ -44,3 +43,6 @@
 	sed -i 's/CLEAN_UP_SYSTEM="no"/CLEAN_UP_SYSTEM="yes"/' etc/rcS.conf
 	sed -i 's/RUN_DAEMONS="/RUN_DAEMONS="slim /' etc/rcS.conf
 fi
+for ii in bin/vcsa2txt bin/awk bin/script bin/cut bin/readlink bin/du bin/free; do
+	[ -e usr/$ii ] && rm -f $ii
+done
diff -r 6f21be70783b -r 52ca9fcdca28 slitaz-loram-http/stuff/loram.rootfs
--- a/slitaz-loram-http/stuff/loram.rootfs	Mon Oct 20 21:19:09 2008 +0000
+++ b/slitaz-loram-http/stuff/loram.rootfs	Tue Oct 21 08:48:46 2008 +0000
@@ -34,7 +34,7 @@
 mv default.script usr/share/udhcpc
 ln -s /cdrom/boot boot
 for ii in bin/vcsa2txt bin/awk bin/script bin/cut bin/readlink bin/du bin/free; do
-  ln -s busybox $ii
+  [ -e $ii ] || ln -s busybox $ii
 done
 mkdir cdrom .usr.rw
 COMPRESSION="gzip"
diff -r 6f21be70783b -r 52ca9fcdca28 slitaz-loram/stuff/loram.extract
--- a/slitaz-loram/stuff/loram.extract	Mon Oct 20 21:19:09 2008 +0000
+++ b/slitaz-loram/stuff/loram.extract	Tue Oct 21 08:48:46 2008 +0000
@@ -1,5 +1,4 @@
 rmdir usr
-rm -f bin/vcsa2txt bin/awk bin/script bin/cut bin/readlink
 packedfs=".usr.cromfs"
 if [ -f $packedfs ]; then
 	bin/unmkcromfs $packedfs usr
@@ -20,3 +19,6 @@
 for ii in lib/libz.so lib/libstdc++.so lib/libgcc_s.so; do
 	[ -e $ii ] && mv $ii* usr/lib/
 done
+for ii in bin/vcsa2txt bin/awk bin/script bin/cut bin/readlink; do
+	[ -e usr/$ii ] && rm -f $ii
+done
diff -r 6f21be70783b -r 52ca9fcdca28 slitaz-loram/stuff/loram.rootfs
--- a/slitaz-loram/stuff/loram.rootfs	Mon Oct 20 21:19:09 2008 +0000
+++ b/slitaz-loram/stuff/loram.rootfs	Tue Oct 21 08:48:46 2008 +0000
@@ -37,5 +37,5 @@
 COMPRESSION="none"
 echo "$(du -hs ./.usr.*fs | cut -f1) are used by /usr after compression"
 for ii in bin/vcsa2txt bin/awk bin/script bin/cut bin/readlink; do
-  ln -s busybox $ii
+  [ -e $ii ] || ln -s busybox $ii
 done