# HG changeset patch
# User Pascal Bellard <pascal.bellard@slitaz.org>
# Date 1204984502 0
# Node ID 6909e27a7f91f6a69fe61b5e81199d68d654cfab
# Parent  526c779c93319cc830be716a2d4e40f5f82c1196
Slitaz-loram*: do not remove itself during install...

diff -r 526c779c9331 -r 6909e27a7f91 slitaz-loram-cdrom/receipt
--- a/slitaz-loram-cdrom/receipt	Sat Mar 08 13:37:54 2008 +0100
+++ b/slitaz-loram-cdrom/receipt	Sat Mar 08 13:55:02 2008 +0000
@@ -19,19 +19,20 @@
     local line
     local i
     tag="Handle kernel cmdline parameter config"
-    i=$(grep -n "$tag" /etc/init.d/rcS | cut -d: -f1)
+    i=$(grep -n "$tag" $1/etc/init.d/rcS | cut -d: -f1)
     i=$(($i-1))
-    tag=$(grep "$tag" /etc/init.d/rcS)
-    if [ "$1" = "-R" ]; then
+    tag=$(grep "$tag" $1/etc/init.d/rcS)
+    if [ "$2" = "-R" ]; then
     	line="-$(($i-24)),26 +$(($i-24)),2"
 	i="-"
     else
+        grep -q 'if [ -d /cdrom ]; then' $1/etc/init.d/rcS && return
     	line="-$i,2 +$i,26"
 	i="+"
     fi
     cat <<EOF
---- /etc/init.d/rcS
-+++ /etc/init.d/rcS
+--- $1/etc/init.d/rcS
++++ $1/etc/init.d/rcS
 @@ $line @@
  
 $i# Mount /usr
@@ -60,6 +61,7 @@
 $i
  $tag
 EOF
+    chmod 0755 $1/etc/init.d/rcS
 }
 
 # Pre and post install commands for Tazpkg.
@@ -67,12 +69,14 @@
 {
     local $loram
     loram=$(cd /var/lib/tazpkg/installed ; ls -d slitaz-loram* 2> /dev/null)
-    [ -n "$loram" ] && yes y | tazpkg remove $loram
+    [ -n "$loram" -a "$loram" != "$PACKAGE" ] && yes y | tazpkg remove $loram
 }
 
 post_install()
 {
-    get_patch | patch -p0
+    local root
+    root=$1
+    get_patch "$root" | patch -p0
     if [ ! -x /bin/funionfs ]; then
         cat <<EOF
 You will build a live CD with /usr mounted read-only.
@@ -85,5 +89,5 @@
 # Pre remove commands for Tazpkg.
 pre_remove()
 {
-    get_patch -R | patch -p0
+    get_patch '' -R | patch -p0
 }
diff -r 526c779c9331 -r 6909e27a7f91 slitaz-loram/receipt
--- a/slitaz-loram/receipt	Sat Mar 08 13:37:54 2008 +0100
+++ b/slitaz-loram/receipt	Sat Mar 08 13:55:02 2008 +0000
@@ -20,19 +20,20 @@
     local line
     local i
     tag="Creat /dev/cdrom if needed"
-    i=$(grep -n "$tag" /etc/init.d/rcS | cut -d: -f1)
+    i=$(grep -n "$tag" $1/etc/init.d/rcS | cut -d: -f1)
     i=$(($i-1))
-    tag=$(grep "$tag" /etc/init.d/rcS)
-    if [ "$1" = "-R" ]; then
+    tag=$(grep "$tag" $1/etc/init.d/rcS)
+    if [ "$2" = "-R" ]; then
     	line="-$(($i-13)),15 +$(($i-13)),2"
 	i="-"
     else
+        grep -q 'if [ -f /.usr.cromfs ]; then' $1/etc/init.d/rcS && return
     	line="-$i,2 +$i,15"
 	i="+"
     fi
     cat <<EOF
---- /etc/init.d/rcS
-+++ /etc/init.d/rcS
+--- $1/etc/init.d/rcS
++++ $1/etc/init.d/rcS
 @@ $line @@
  
 $i# Mount compressed /usr
@@ -50,6 +51,7 @@
 $i
  $tag
 EOF
+    chmod 0755 $1/etc/init.d/rcS
 }
 
 # Pre and post install commands for Tazpkg.
@@ -57,12 +59,14 @@
 {
     local $loram
     loram=$(cd /var/lib/tazpkg/installed ; ls -d slitaz-loram* 2> /dev/null)
-    [ -n "$loram" ] && yes y | tazpkg remove $loram
+    [ -n "$loram" -a "$loram" != "$PACKAGE" ] && yes y | tazpkg remove $loram
 }
 
 post_install()
 {
-    get_patch | patch -p0
+    local root
+    root=$1
+    get_patch "$root" | patch -p0
     if [ ! -x /bin/funionfs ]; then
         cat <<EOF
 You will build a live CD with /usr mounted read-only.
@@ -75,5 +79,5 @@
 # Pre remove commands for Tazpkg.
 pre_remove()
 {
-    get_patch -R | patch -p0
+    get_patch '' -R | patch -p0
 }