make bootable fix for debian-cd

[Sven Hoexter <sven@telelev.net>]

Hi,
while playing around with debian-cd (CVS version) I got a problem with
make bootable

[running in debug mode]
 for DISK in CD1 CD1_NONUS ; do \
        mkdir -p /mnt/data/debcd/tmp/woody-i386/$DISK/dists/woody/main/disks-i386 ; \
        if [ ! -e "/mnt/data/debcd/debian/dists/woody/main/disks-i386" ]; then \
            break; \
        fi; \
        /mnt/data/debcd/helpers/debian-cd/tools/add_files \
        /mnt/data/debcd/tmp/woody-i386/$DISK/dists/woody/main/disks-i386 \
        /mnt/data/debcd/debian/dists/woody/main/disks-i386 . ; \
        touch /mnt/data/debcd/tmp/woody-i386/$DISK/.disk/kernel_installable ; \
        cd /mnt/data/debcd/tmp/woody-i386/$DISK/dists/woody/main/disks-i386; \
        rm -rf base-images-*; \
        if [ "" != "" ]; then exit 0; fi; \
        if [ -L current ]; then \
                CURRENT_LINK=`ls -l current | awk '{print $11}'`; \
                mv $CURRENT_LINK .tmp_link; \
                rm -rf [0123456789]*; \
                mv .tmp_link $CURRENT_LINK; \
        elif [ -d current ]; then \
                rm -rf [0123456789]*; \
        fi; \
done
mv: Fehlendes Dateiargument
»mv --help« gibt weitere Informationen.
make: *** [/mnt/data/debcd/tmp/woody-i386/CD1/dists/woody/main/disks-i386] Fehler 1
===end===

english mv error message would be:
mv: missing file argument
Try `mv --help' for more information.

I found the problem in the awk part of the CURRENT_LINK definition.
sven@marvin:/mnt/data/debcd/tmp/woody-i386/CD1/dists/woody/main/disks-i386$ ls -l current
lrwxrwxrwx    2 sven     users          17 2003-02-03 23:27 current -> 3.0.23-2002-05-21
sven@marvin:/mnt/data/debcd/tmp/woody-i386/CD1/dists/woody/main/disks-i386$ ls -l current|awk '{print $11}'

sven@marvin:/mnt/data/debcd/tmp/woody-i386/CD1/dists/woody/main/disks-i386$ ls -l current|awk '{print $10}'
3.0.23-2002-05-21

Well this diff fixed the problem:

--- Makefile.orig       2003-02-04 20:23:16.000000000 +0100
+++ Makefile    2003-02-04 18:37:23.000000000 +0100
@@ -658,7 +658,7 @@
                rm -rf base-images-*; \
                if [ "$(SYMLINK)" != "" ]; then exit 0; fi; \
                if [ -L current ]; then \
-                       CURRENT_LINK=`ls -l current | awk '{print $$11}'`; \
+                       CURRENT_LINK=`ls -l current | awk '{print $$10}'`; \
                        mv $$CURRENT_LINK .tmp_link; \
                        rm -rf [0123456789]*; \
                        mv .tmp_link $$CURRENT_LINK; \

Had somebody else the same problem or am I the first?

Sven

-- 
Revolution is not a dinner party, not an essay, nor a painting, nor a piece of
embroidery; it cannot be advanced softly, gradually, carefully, considerately,
respectfully, politely, plainly, and modestly.
- Mao Zedong (Mao Tse-tung)